components/database/unixodbc/patches/003-mutex-exit.patch

   1 --- unixODBC-2.3.6/odbcinst/SQLGetPrivateProfileString.c        2016-12-12 13:03:47.000000000 +0000
   2 +++ unixODBC-2.3.6/odbcinst/SQLGetPrivateProfileString.c.new    2018-07-08 17:39:50.758706457 +0000
   3 @@ -39,7 +39,7 @@ static int mutex_entry( pth_mutex_t *mut
   4      return pth_mutex_acquire( mutex, 0, NULL );
   5  }
   6
   7 -static int mutex_exit( pth_mutex_t *mutex )
   8 +static int odbc_mutex_exit( pth_mutex_t *mutex )
   9  {
  10      return pth_mutex_release( mutex );
  11  }
  12 @@ -55,7 +55,7 @@ static int mutex_entry( pthread_mutex_t
  13      return pthread_mutex_lock( mutex );
  14  }
  15
  16 -static int mutex_exit( pthread_mutex_t *mutex )
  17 +static int odbc_mutex_exit( pthread_mutex_t *mutex )
  18  {
  19      return pthread_mutex_unlock( mutex );
  20  }
  21 @@ -71,7 +71,7 @@ static int mutex_entry( mutex_t *mutex )
  22      return mutex_lock( mutex );
  23  }
  24
  25 -static int mutex_exit( mutex_t *mutex )
  26 +static int odbc_mutex_exit( mutex_t *mutex )
  27  {
  28      return mutex_unlock( mutex );
  29  }
  30 @@ -79,7 +79,7 @@ static int mutex_exit( mutex_t *mutex )
  31  #else
  32
  33  #define mutex_entry(x)
  34 -#define mutex_exit(x)
  35 +#define odbc_mutex_exit(x)
  36
  37  #endif
  38
  39 @@ -295,7 +295,7 @@ static int check_ini_cache( int *ret,
  40         rval = _check_ini_cache( ret, pszSection, pszEntry, pszDefault,
  41                         pRetBuffer, nRetBuffer, pszFileName );
  42
  43 -       mutex_exit( &mutex_ini );
  44 +       odbc_mutex_exit( &mutex_ini );
  45
  46         return rval;
  47  }
  48 @@ -323,7 +323,7 @@ static void save_ini_cache( int ret,
  49                         pRetBuffer, nRetBuffer, pszFileName );
  50         }
  51
  52 -       mutex_exit( &mutex_ini );
  53 +       odbc_mutex_exit( &mutex_ini );
  54  }
  55
  56  void __clear_ini_cache( void )
  57 @@ -332,7 +332,7 @@ void __clear_ini_cache( void )
  58
  59      _clear_ini_cache();
  60
  61 -       mutex_exit( &mutex_ini );
  62 +       odbc_mutex_exit( &mutex_ini );
  63  }
  64
  65  #else