Modified:
trunk/util/MYODBCUtilReadDriver.c
Log:
Remove some dead code (workaround for ancient Mac OS X problem)
Modified: trunk/util/MYODBCUtilReadDriver.c
===================================================================
--- trunk/util/MYODBCUtilReadDriver.c 2007-02-13 19:14:29 UTC (rev 166)
+++ trunk/util/MYODBCUtilReadDriver.c 2007-02-13 21:15:23 UTC (rev 167)
@@ -67,18 +67,7 @@
pszSectionName = szSectionNames;
while ( *pszSectionName )
{
-#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 ( GetPrivateProfileString( pszSectionName, "DRIVER", NULL, szValue,
sizeof( szValue ) - 1, "ODBCINST.INI" ) > 0 )
-#else
if ( SQLGetPrivateProfileString( pszSectionName, "DRIVER", "", szValue,
sizeof( szValue ) - 1, "ODBCINST.INI" ) > 0 )
-#endif
{
if ( strcmp( szValue, pszFileName ) == 0 )
break;
@@ -95,9 +84,7 @@
if ( !pszSectionName )
return FALSE;
-#if defined(__APPLE__) && 0
- if ( GetPrivateProfileString( pszSectionName, NULL, NULL, szEntryNames, sizeof(
szEntryNames ) - 1, "ODBCINST.INI" ) < 1 )
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
if ( SQLGetPrivateProfileString( pszSectionName, "", "", szEntryNames, sizeof(
szEntryNames ) - 1, "ODBCINST.INI" ) < 1 )
#else
if ( SQLGetPrivateProfileString( pszSectionName, NULL, NULL, szEntryNames, sizeof(
szEntryNames ) - 1, "ODBCINST.INI" ) < 1 )
@@ -111,11 +98,7 @@
{
*szValue = '\0';
-#if defined(__APPLE__) && 0
- if ( GetPrivateProfileString( pszSectionName, pszEntryName, NULL, szValue,
sizeof( szValue ) - 1, "ODBCINST.INI" ) > 0 )
-#else
if ( SQLGetPrivateProfileString( pszSectionName, pszEntryName, "", szValue,
sizeof( szValue ) - 1, "ODBCINST.INI" ) > 0 )
-#endif
{
if ( strcasecmp( pszEntryName, "DRIVER" ) == 0 )
{
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r167 - trunk/util | jwinstead | 13 Feb |
