diff -Naur /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilDSNExists.c ./util/MYODBCUtilDSNExists.c --- /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilDSNExists.c 2005-01-28 14:05:17.000000000 -0800 +++ ./util/MYODBCUtilDSNExists.c 2005-04-19 11:44:06.000000000 -0700 @@ -52,15 +52,6 @@ if ( SQLGetPrivateProfileString( pszDataSourceName, NULL, "", szSectionNames, sizeof( szSectionNames ) - 1, "ODBC.INI" ) > 0 ) return TRUE; else -#elif defined(__OSX__) - /*! - \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( NULL, NULL, NULL, szSectionNames, sizeof( szSectionNames ) - 1, "ODBC.INI" ) < 1 ) #else if ( SQLGetPrivateProfileString( NULL, NULL, "", szSectionNames, sizeof( szSectionNames ) - 1, "ODBC.INI" ) < 1 ) #endif diff -Naur /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilGetDataSourceNames.c ./util/MYODBCUtilGetDataSourceNames.c --- /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilGetDataSourceNames.c 2005-01-28 14:05:17.000000000 -0800 +++ ./util/MYODBCUtilGetDataSourceNames.c 2005-04-19 11:45:32.000000000 -0700 @@ -24,12 +24,6 @@ \internal \brief Put a list of existing data source names in pszBuffer. - \note OSX - - SQLGetPrivateProfileString() is broken but fortunately - the old GetPrivateProfileString() is available and seems - to work fine. - \note XP SQLGetPrivateProfileString() with a NULL 1st arg does @@ -75,9 +69,7 @@ return FALSE; } -#if defined(__APPLE__) - nChars = GetPrivateProfileString( NULL, NULL, "", pszBuffer, nBuffer - 1, "ODBC.INI" ); -#elif defined(WIN32) +#if defined(WIN32) /* This returns no data as does having a NULL for 1st arg!? diff -Naur /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilGetDriverNames.c ./util/MYODBCUtilGetDriverNames.c --- /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilGetDriverNames.c 2005-01-28 14:05:17.000000000 -0800 +++ ./util/MYODBCUtilGetDriverNames.c 2005-04-19 11:45:50.000000000 -0700 @@ -24,11 +24,6 @@ \internal \brief Put a list of installed drivers in pszBuffer. - \note OSX - - SQLGetPrivateProfileString() is broken but fortunately - the old GetPrivateProfileString() is available. - \note XP SQLGetPrivateProfileString() with a NULL 1st arg does @@ -49,9 +44,7 @@ } -#if defined(__APPLE__) - nChars = GetPrivateProfileString( NULL, NULL, "", pszBuffer, nBuffer - 1, "ODBCINST.INI" ); -#elif defined(WIN32) +#if defined(WIN32) nChars = ( SQLGetInstalledDrivers( pszBuffer, nBuffer - 1, NULL ) ? 1 : 0 ); #else nChars = SQLGetPrivateProfileString( NULL, NULL, "", pszBuffer, nBuffer - 1, "ODBCINST.INI" ); diff -Naur /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilReadDataSource.c ./util/MYODBCUtilReadDataSource.c --- /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilReadDataSource.c 2005-01-31 19:09:18.000000000 -0800 +++ ./util/MYODBCUtilReadDataSource.c 2005-04-19 11:46:57.000000000 -0700 @@ -61,18 +61,7 @@ *szEntryNames = '\0'; -#if defined(__APPLE__) - /*! - \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 ) -#else if ( ( nChars = SQLGetPrivateProfileString( pszDSN, NULL, NULL, szEntryNames, sizeof( szEntryNames ) - 1, "ODBC.INI" ) ) < 1 ) -#endif return FALSE; #if defined(WIN32) @@ -118,9 +107,7 @@ while ( *pszEntryName ) { *szValue = '\0'; -#if defined(__APPLE__) - if ( GetPrivateProfileString( pszDSN, pszEntryName, NULL, szValue, sizeof( szValue ) - 1, "odbc.ini" ) > 0 ) -#elif defined(WIN32) +#if defined(WIN32) if ( SQLGetPrivateProfileString( pszDSN, pszEntryName, NULL, szValue, sizeof( szValue ) - 1, "ODBC.INI" ) > 0 ) #else if ( SQLGetPrivateProfileString( pszDSN, pszEntryName, "", szValue, sizeof( szValue ) - 1, "ODBC.INI" ) > 0 ) @@ -215,22 +202,14 @@ /* try harder to get the friendly driver name */ if ( !pDataSource->pszDRIVER ) { -#if defined(__APPLE__) - if ( GetPrivateProfileString( MYODBCUTIL_ODBCINI_HEADER_SECTION, NULL, NULL, szEntryNames, sizeof( szEntryNames ) - 1, "odbc.ini" ) < 1 ) -#else if ( SQLGetPrivateProfileString( MYODBCUTIL_ODBCINI_HEADER_SECTION, NULL, NULL, szEntryNames, sizeof( szEntryNames ) - 1, "ODBC.INI" ) < 1 ) -#endif return FALSE; pszEntryName = szEntryNames; while ( *pszEntryName ) { *szValue = '\0'; -#if defined(__APPLE__) - if ( GetPrivateProfileString( MYODBCUTIL_ODBCINI_HEADER_SECTION, pszEntryName, NULL, szValue, sizeof( szValue ) - 1, "odbc.ini" ) > 0 ) -#else if ( SQLGetPrivateProfileString( MYODBCUTIL_ODBCINI_HEADER_SECTION, pszEntryName, NULL, szValue, sizeof( szValue ) - 1, "ODBC.INI" ) > 0 ) -#endif { if ( strcasecmp( pszEntryName, pszDSN ) == 0 ) { diff -Naur /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilReadDriver.c ./util/MYODBCUtilReadDriver.c --- /Volumes/OS10_3/Users/brooks/MyODBC-3.51.11/util/MYODBCUtilReadDriver.c 2005-01-28 14:05:17.000000000 -0800 +++ ./util/MYODBCUtilReadDriver.c 2005-04-19 11:47:31.000000000 -0700 @@ -40,18 +40,7 @@ if ( !pDriver->pszName ) pDriver->pszName = strdup( pszName ) ; -#if defined(__APPLE__) - /*! - \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( pszName, NULL, NULL, szEntryNames, sizeof( szEntryNames ) - 1, "ODBCINST.INI" ) < 1 ) -#else if ( SQLGetPrivateProfileString( pszName, NULL, "", szEntryNames, sizeof( szEntryNames ) - 1, "ODBCINST.INI" ) < 1 ) -#endif return FALSE; /*! @@ -61,11 +50,7 @@ while ( *pszEntryName ) { *szValue = '\0'; -#if defined(__APPLE__) - if ( GetPrivateProfileString( pszName, pszEntryName, NULL, szValue, sizeof( szValue ) - 1, "ODBCINST.INI" ) > 0 ) -#else if ( SQLGetPrivateProfileString( pszName, pszEntryName, "", szValue, sizeof( szValue ) - 1, "ODBCINST.INI" ) > 0 ) -#endif { if ( strcasecmp( pszEntryName, "DRIVER" ) == 0 ) {