List:Commits« Previous MessageNext Message »
From:jbalint Date:July 30 2007 11:40pm
Subject:Connector/ODBC 3.51 commit: r616 - trunk/util
View as plain text  
Modified:
   trunk/util/MYODBCUtilReadDataSource.c
Log:
add missing default param to SQLGetPrivateProfileString()


Modified: trunk/util/MYODBCUtilReadDataSource.c
===================================================================
--- trunk/util/MYODBCUtilReadDataSource.c	2007-07-30 21:40:10 UTC (rev 615)
+++ trunk/util/MYODBCUtilReadDataSource.c	2007-07-30 21:40:59 UTC (rev 616)
@@ -61,20 +61,7 @@
 
     *szEntryNames = '\0';
 
-#if defined(__APPLE__) && 0
-    /*!
-        \note   OSX
-
-                SQLGetPrivateProfileString is the proper call and is available - but
-                at this time it appears utterly broken. So we call an alternative
-                instead. 
-    */
-    if ( ( nChars = GetPrivateProfileString( pszDSN, NULL, NULL, szEntryNames, sizeof(
szEntryNames ) - 1, "odbc.ini" ) ) < 1 )
-#elif defined(__APPLE__)
-    if ( ( nChars = SQLGetPrivateProfileString( pszDSN, "", "", szEntryNames, sizeof(
szEntryNames ) - 1, "odbc.ini" ) ) < 1 )
-#else
-    if ( ( nChars = SQLGetPrivateProfileString( pszDSN, NULL, NULL, szEntryNames, sizeof(
szEntryNames ) - 1, "ODBC.INI" ) ) < 1 )
-#endif
+    if ( ( nChars = SQLGetPrivateProfileString( pszDSN, "", "", szEntryNames, sizeof(
szEntryNames ) - 1, "ODBC.INI" ) ) < 1 )
     {
         return FALSE;
     }

Thread
Connector/ODBC 3.51 commit: r616 - trunk/utiljbalint30 Jul