cvs: php4 /ext/sybase_ct php_sybase_ct.c php_sybase_ct.h

joey Sat Sep 9 22:13:56 2000 EDT Modified files: /php4/ext/sybase_ct php_sybase_ct.c php_sybase_ct.h Log: Use new Zend API stuff. Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.27 php4/ext/sybase_ct/php_sybase_ct.c:1.28 --- php4/ext/sybase_ct/php_sybase_ct.c:1.27 Mon Jul 24 12:12:32 2000 +++ php4/ext/sybase_ct/php_sybase_ct.c Sat Sep 9 22:13:56 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.27 2000/07/24 19:12:32 joey Exp $ */ +/* $Id: php_sybase_ct.c,v 1.28 2000/09/10 05:13:56 joey Exp $ */ #include "php.h" @@ -71,12 +71,12 @@ "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; } } Index: php4/ext/sybase_ct/php_sybase_ct.h diff -u php4/ext/sybase_ct/php_sybase_ct.h:1.6 php4/ext/sybase_ct/php_sybase_ct.h:1.7 --- php4/ext/sybase_ct/php_sybase_ct.h:1.6 Sun Jul 23 18:39:50 2000 +++ php4/ext/sybase_ct/php_sybase_ct.h Sat Sep 9 22:13:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.h,v 1.6 2000/07/24 01:39:50 david Exp $ */ +/* $Id: php_sybase_ct.h,v 1.7 2000/09/10 05:13:56 joey Exp $ */ #ifndef PHP_SYBASE_CT_H #define PHP_SYBASE_CT_H @@ -57,7 +57,7 @@ #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 @@ 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;