Connector/ODBC 5 commit: r230 - MYODBCC/MYODBCCLib MYODBCC/include MYSQLPlus/MYSQLPlusLib dltest

[pharvey]

Modified:
   MYODBCC/MYODBCCLib/MYODBCC.cpp
   MYODBCC/include/MYODBCC.h
   MYSQLPlus/MYSQLPlusLib/MResultPlus.h
   dltest/dltest.c
Log:


Modified: MYODBCC/MYODBCCLib/MYODBCC.cpp
===================================================================
--- MYODBCC/MYODBCCLib/MYODBCC.cpp	2006-05-13 06:24:56 UTC (rev 229)
+++ MYODBCC/MYODBCCLib/MYODBCC.cpp	2006-05-13 18:22:29 UTC (rev 230)
@@ -1383,19 +1383,19 @@
     return memcpy( pDest, pSrc, nBytes );
 }
 
-#ifdef wcsncpy_s
-BOOLEAN MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc, size_t nChars )
-{
-    if ( wcsncpy_s( pszDest, nSizeInWords, pszSrc, nChars ) )
-        return false;
-    return true;
-}
+#if defined(_WIN32) && _MSC_VER >= 1400
+    BOOLEAN MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc, size_t nChars )
+    {
+        if ( wcsncpy_s( pszDest, nSizeInWords, pszSrc, nChars ) )
+            return false;
+        return true;
+    }
 #else
-BOOLEAN MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nChars, const SQLWCHAR *pszSrc )
-{
-    wcsncpy( pszDest, pszSrc, nChars );
-    return true;
-}
+    BOOLEAN MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nChars, const SQLWCHAR *pszSrc
)
+    {
+        wcsncpy( pszDest, pszSrc, nChars );
+        return true;
+    }
 #endif
 
 void MYODBCC::doFree( void *p )

Modified: MYODBCC/include/MYODBCC.h
===================================================================
--- MYODBCC/include/MYODBCC.h	2006-05-13 06:24:56 UTC (rev 229)
+++ MYODBCC/include/MYODBCC.h	2006-05-13 18:22:29 UTC (rev 230)
@@ -243,11 +243,13 @@
     static QString getInstallerErrorString( RETCODE nRetCode );
 
     static void *   doMemCpy( void *pDest, const void *pSrc, size_t nBytes );
-#ifdef _TRUNCATE
+
+#if defined(_WIN32) && _MSC_VER >= 1400
     static BOOLEAN  doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc, size_t nChars = _TRUNCATE );
 #else
     static BOOLEAN  doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc );
 #endif
+
     static void     doFree( void *p );
 
     static BOOLEAN isConnectAttr( SQLINTEGER nAttribute );

Modified: MYSQLPlus/MYSQLPlusLib/MResultPlus.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResultPlus.h	2006-05-13 06:24:56 UTC (rev 229)
+++ MYSQLPlus/MYSQLPlusLib/MResultPlus.h	2006-05-13 18:22:29 UTC (rev 230)
@@ -32,6 +32,11 @@
             MResultRes
             MResultStmt
 */
+
+#if defined(_WIN32) && _MSC_VER < 1400
+    typedef QVector<QVariant> MResultPlusRow;
+#endif
+
 class MResultPlus : public MResult
 {
 public:
@@ -75,7 +80,12 @@
 
 private:
     /* Our result set is a list of rows. Each row is a vector of column data. Column data
is a QVariant. */
+#if defined(_WIN32) && _MSC_VER < 1400
+    QList<MResultPlusRow>       listResults;
+#else
     QList<QVector<QVariant>>    listResults;
+#endif
+
     qulonglong                  nRow; /* 1 -based (0 as BOS/EOS) */
 
     /*                                                              

Modified: dltest/dltest.c
===================================================================
--- dltest/dltest.c	2006-05-13 06:24:56 UTC (rev 229)
+++ dltest/dltest.c	2006-05-13 18:22:29 UTC (rev 230)
@@ -1,18 +1,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef _UNIX_
+#if defined(_UNIX_)
     #include <ltdl.h>
-#else
+#elif defined(_WIN32)
     #include <windows.h>
     #include <tchar.h>
+    #if _MSC_VER < 1400
+        #define _tprintf_s _tprintf
+    #endif
 #endif
 
-#ifndef _tprintf_s
-#define _tprintf_s _tprintf
-#endif
 
-
 TCHAR *szSyntax =
 _T("\n") \
 _T("+---                                         \n") \