--- unixODBC-2.3.6/odbcinst/SQLGetPrivateProfileString.c 2016-12-12 13:03:47.000000000 +0000 +++ unixODBC-2.3.6/odbcinst/SQLGetPrivateProfileString.c.new 2018-07-08 17:39:50.758706457 +0000 @@ -39,7 +39,7 @@ static int mutex_entry( pth_mutex_t *mut return pth_mutex_acquire( mutex, 0, NULL ); } -static int mutex_exit( pth_mutex_t *mutex ) +static int odbc_mutex_exit( pth_mutex_t *mutex ) { return pth_mutex_release( mutex ); } @@ -55,7 +55,7 @@ static int mutex_entry( pthread_mutex_t return pthread_mutex_lock( mutex ); } -static int mutex_exit( pthread_mutex_t *mutex ) +static int odbc_mutex_exit( pthread_mutex_t *mutex ) { return pthread_mutex_unlock( mutex ); } @@ -71,7 +71,7 @@ static int mutex_entry( mutex_t *mutex ) return mutex_lock( mutex ); } -static int mutex_exit( mutex_t *mutex ) +static int odbc_mutex_exit( mutex_t *mutex ) { return mutex_unlock( mutex ); } @@ -79,7 +79,7 @@ static int mutex_exit( mutex_t *mutex ) #else #define mutex_entry(x) -#define mutex_exit(x) +#define odbc_mutex_exit(x) #endif @@ -295,7 +295,7 @@ static int check_ini_cache( int *ret, rval = _check_ini_cache( ret, pszSection, pszEntry, pszDefault, pRetBuffer, nRetBuffer, pszFileName ); - mutex_exit( &mutex_ini ); + odbc_mutex_exit( &mutex_ini ); return rval; } @@ -323,7 +323,7 @@ static void save_ini_cache( int ret, pRetBuffer, nRetBuffer, pszFileName ); } - mutex_exit( &mutex_ini ); + odbc_mutex_exit( &mutex_ini ); } void __clear_ini_cache( void ) @@ -332,7 +332,7 @@ void __clear_ini_cache( void ) _clear_ini_cache(); - mutex_exit( &mutex_ini ); + odbc_mutex_exit( &mutex_ini ); } #else