diff options
| author | Andreas Karajannis <kara@php.net> | 1999-10-07 18:49:41 +0000 |
|---|---|---|
| committer | Andreas Karajannis <kara@php.net> | 1999-10-07 18:49:41 +0000 |
| commit | 6cd07c51656991b36ad5b9c5abe9aa4a366f8483 (patch) | |
| tree | 2215e44216cfbc81f0ff1de86d34aab4ebabe9a7 /ext/odbc/php_odbc.h | |
| parent | 2a6d170dc01f9a820327a5813119c126c8fda2c1 (diff) | |
| download | php-git-6cd07c51656991b36ad5b9c5abe9aa4a366f8483.tar.gz | |
Made henv a real global var. Seems to work basically when multithreaded
Diffstat (limited to 'ext/odbc/php_odbc.h')
| -rw-r--r-- | ext/odbc/php_odbc.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index 831e718b83..5aa7628396 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -39,6 +39,10 @@ #define FAR #endif +#ifdef ZTS +#include "TSRM.h" +#endif + /* checking in the same order as in configure.in */ #if HAVE_SOLID /* Solid Server */ @@ -220,11 +224,6 @@ typedef struct odbc_result { } odbc_result; typedef struct { -#if defined( HAVE_DB2 ) || defined( HAVE_UNIXODBC ) - SQLHANDLE henv; -#else - HENV henv; -#endif char *defDB; char *defUser; char *defPW; @@ -263,7 +262,6 @@ int odbc_bindcols(odbc_result *result); # define ODBCLS_CC , ODBCLS_C # define ODBCG(v) (odbc_globals->v) # define ODBCLS_FETCH() php_odbc_globals *odbc_globals = ts_resource(odbc_globals_id) -# define ODBC_TLS_VARS char *globals; ODBCLS_FETCH(); globals = (char *)odbc_globals; #else # define ODBCLS_D # define ODBCLS_DC @@ -271,7 +269,6 @@ int odbc_bindcols(odbc_result *result); # define ODBCLS_CC # define ODBCG(v) (odbc_globals.v) # define ODBCLS_FETCH() -# define ODBC_TLS_VARS char *globals = (char *)&odbc_globals extern ZEND_API php_odbc_globals odbc_globals; #endif |