Connector/ODBC 5 commit: r477 - in trunk: . MYODBCC/MYODBCCLib MYODBCC/include dltest

[pharvey]

Modified:
   trunk/MYODBCC/MYODBCCLib/MYODBCC.cpp
   trunk/MYODBCC/include/MYODBCC.h
   trunk/defines.pri
   trunk/dltest/dltest.c
   trunk/dltest/dltest.pro
   trunk/root.pro
Log:
- some work for Linux port


Modified: trunk/MYODBCC/MYODBCCLib/MYODBCC.cpp
===================================================================
--- trunk/MYODBCC/MYODBCCLib/MYODBCC.cpp	2006-08-07 17:20:52 UTC (rev 476)
+++ trunk/MYODBCC/MYODBCCLib/MYODBCC.cpp	2006-08-08 05:00:43 UTC (rev 477)
@@ -38,16 +38,23 @@
     return calloc( nRecords, nRecordBytes );
 }
 
-#ifdef wcsnlen
-size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t nMaxChars )
-{
-    return wcsnlen( psz, nMaxChars );
-}
+#ifdef _UNIX_
+        size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t nMaxChars )
+        {
+            return wcsnlen( psz, nMaxChars );
+        }
 #else
-size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t )
-{
-    return wcslen( psz );
-}
+    #ifdef wcsnlen
+        size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t nMaxChars )
+        {
+            return wcsnlen( psz, nMaxChars );
+        }
+    #else
+        size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t )
+        {
+            return wcslen( psz );
+        }
+    #endif
 #endif
 
 int MYODBCC::getKeywordValuesLength( LPCWSTR pszzKeywordValues )

Modified: trunk/MYODBCC/include/MYODBCC.h
===================================================================
--- trunk/MYODBCC/include/MYODBCC.h	2006-08-07 17:20:52 UTC (rev 476)
+++ trunk/MYODBCC/include/MYODBCC.h	2006-08-08 05:00:43 UTC (rev 477)
@@ -73,6 +73,10 @@
     #include <windows.h>
 #endif
 
+#ifdef _UNIX_
+    #include <wchar.h>
+#endif
+
 #include <sqltypes.h>
 #include <odbcinst.h>
 #include <sqlext.h>

Modified: trunk/defines.pri
===================================================================
--- trunk/defines.pri	2006-08-07 17:20:52 UTC (rev 476)
+++ trunk/defines.pri	2006-08-08 05:00:43 UTC (rev 477)
@@ -73,7 +73,7 @@
 # #########################################################
 unix {
 	DEFINES += _UNIX_
-	LIBS	+= $(LDFLAGS)
+#	LIBS	+= $(LDFLAGS)
 }
 
 

Modified: trunk/dltest/dltest.c
===================================================================
--- trunk/dltest/dltest.c	2006-08-07 17:20:52 UTC (rev 476)
+++ trunk/dltest/dltest.c	2006-08-08 05:00:43 UTC (rev 477)
@@ -3,6 +3,11 @@
 
 #if defined(_UNIX_)
     #include <ltdl.h>
+    #include <sqltypes.h>
+/*
+    #include <odbcinst.h>
+    #include <sqlext.h>
+*/
 #elif defined(_WIN32)
     #include <windows.h>
     #include <tchar.h>
@@ -12,7 +17,7 @@
 #endif
 
 
-TCHAR *szSyntax =
+wchar_t *szSyntax =
 _T("\n") \
 _T("+---                                         \n") \
 _T("| dltest                                     \n") \

Modified: trunk/dltest/dltest.pro
===================================================================
--- trunk/dltest/dltest.pro	2006-08-07 17:20:52 UTC (rev 476)
+++ trunk/dltest/dltest.pro	2006-08-08 05:00:43 UTC (rev 477)
@@ -19,7 +19,7 @@
 include( ../common.pri )
 include( ../config.pri )
 include( ../defines.pri )
-CONFIG                  -= qt
+# CONFIG                  -= qt
 CONFIG                  += console
 
 # #########################################################

Modified: trunk/root.pro
===================================================================
--- trunk/root.pro	2006-08-07 17:20:52 UTC (rev 476)
+++ trunk/root.pro	2006-08-08 05:00:43 UTC (rev 477)
@@ -52,7 +52,7 @@
 # #########################################################
 TEMPLATE        = subdirs
 SUBDIRS		= \
-                dltest \
+#               dltest \
 		MYODBCC \
 		MYODBCDbg \
 		MYODBCTst \