Use new Zend API stuff.

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index e6ac87d12e5a315bcf8a7b97dd7d620aec89256b..5061267b1f3dbd9f614e0fcbff6128719d95d69f 100644 (file)
--- 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 080c5207c8828fff2ecc1a2bfb80d936404510f2..39e63f6e3d4229a79c58a260dde12a8418925b27 100644 (file)
--- 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;