summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/sybase_ct/php_sybase_ct.c6
-rw-r--r--ext/sybase_ct/php_sybase_ct.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index e6ac87d12e..5061267b1f 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -71,13 +71,13 @@ zend_module_entry sybase_module_entry = {
"sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES
};
+ZEND_DECLARE_MODULE_GLOBALS(sybase)
+static CS_CONTEXT *context;
+
#ifdef COMPILE_DL_SYBASE_CT
ZEND_GET_MODULE(sybase)
#endif
-php_sybase_globals sybase_globals;
-static CS_CONTEXT *context;
-
#define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"Sybase: A link to the server could not be established"); RETURN_FALSE; } }
diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h
index 080c5207c8..39e63f6e3d 100644
--- a/ext/sybase_ct/php_sybase_ct.h
+++ b/ext/sybase_ct/php_sybase_ct.h
@@ -57,7 +57,7 @@ PHP_FUNCTION(sybase_fetch_field);
#include <ctpublic.h>
-typedef struct {
+ZEND_BEGIN_MODULE_GLOBALS(sybase)
long default_link;
long num_links,num_persistent;
long max_links,max_persistent;
@@ -68,7 +68,7 @@ typedef struct {
int le_link,le_plink,le_result;
long min_server_severity, min_client_severity;
long cfg_min_server_severity, cfg_min_client_severity;
-} php_sybase_globals;
+ZEND_END_MODULE_GLOBALS(sybase)
typedef struct {
CS_CONNECTION *connection;