summaryrefslogtreecommitdiff
path: root/ext/interbase/php_interbase.h
diff options
context:
space:
mode:
authorJouni Ahto <jah@php.net>2000-07-05 04:21:00 +0000
committerJouni Ahto <jah@php.net>2000-07-05 04:21:00 +0000
commitec62b2d1cd4ae4a0cc79d94aaa8677dcb750d255 (patch)
treed3fdb02ce88a88aa473671b01a05f45bc9f37757 /ext/interbase/php_interbase.h
parent277b0e15b8cfeb4557badecb5c269eb3ec7d333b (diff)
downloadphp-git-ec62b2d1cd4ae4a0cc79d94aaa8677dcb750d255.tar.gz
- First try at getting interbase to compile and work in ZTS-mode. Compiles.
Diffstat (limited to 'ext/interbase/php_interbase.h')
-rw-r--r--ext/interbase/php_interbase.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index 33a5e29384..d453177e41 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -76,7 +76,7 @@ PHP_FUNCTION(ibase_errmsg);
#define IBASE_TRANS_ON_LINK 10
#define IBASE_BLOB_SEG 4096
-typedef struct {
+ZEND_BEGIN_MODULE_GLOBALS(ibase)
ISC_STATUS status[20];
long default_link;
long num_links, num_persistent;
@@ -91,7 +91,7 @@ typedef struct {
char *timeformat;
char *cfg_timeformat;
char *errmsg;
-} php_ibase_globals;
+ZEND_END_MODULE_GLOBALS(ibase)
typedef struct {
isc_tr_handle trans[IBASE_TRANS_ON_LINK];
@@ -155,14 +155,15 @@ enum php_interbase_option {
};
#ifdef ZTS
-#define IBLS_D php_ibase_globals *ibase_globals
+#define IBLS_D zend_ibase_globals *ibase_globals
+#define IBLS_C ibase_globals
#define IBG(v) (ibase_globals->v)
-#define IBLS_FETCH() php_ibase_globals *ibase_globals = ts_resource(ibase_globals_id)
+#define IBLS_FETCH() zend_ibase_globals *ibase_globals = ts_resource(ibase_globals_id)
#else
#define IBLS_D
+#define IBLS_C
#define IBG(v) (ibase_globals.v)
#define IBLS_FETCH()
-extern PHP_IBASE_API php_ibase_globals ibase_globals;
#endif
#else