cvs: php4 /ext/yaz php_yaz.c php_yaz.h

sniper Fri Jul 12 07:45:04 2002 EDT Modified files: /php4/ext/yaz php_yaz.c php_yaz.h Log: Fix ZTS build Index: php4/ext/yaz/php_yaz.c diff -u php4/ext/yaz/php_yaz.c:1.45 php4/ext/yaz/php_yaz.c:1.46 --- php4/ext/yaz/php_yaz.c:1.45 Thu Jul 11 09:04:02 2002 +++ php4/ext/yaz/php_yaz.c Fri Jul 12 07:45:04 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.c,v 1.45 2002/07/11 13:04:02 dickmeiss Exp $ */ +/* $Id: php_yaz.c,v 1.46 2002/07/12 11:45:04 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -323,8 +323,7 @@ {NULL, NULL, NULL} }; -static void get_assoc (INTERNAL_FUNCTION_PARAMETERS, pval **id, - Yaz_Association *assocp) +static void get_assoc (INTERNAL_FUNCTION_PARAMETERS, pval **id, Yaz_Association *assocp) { Yaz_Association *as = 0; @@ -1094,7 +1093,7 @@ send_APDU (t, apdu); } -static int do_event (int *id, int timeout) +static int do_event (int *id, int timeout TSRMLS_DC) { fd_set input, output; int i; @@ -1587,7 +1586,7 @@ while (ZOOM_event (no, conn_ar)) ; #else - while (do_event(&id, timeout)) + while (do_event(&id, timeout TSRMLS_CC)) ; #endif RETURN_TRUE; @@ -2973,7 +2972,7 @@ } /* }}} */ -void yaz_close_session(Yaz_Association *as) +void yaz_close_session(Yaz_Association *as TSRMLS_DC) { if (*as && (*as)->order == YAZSG(assoc_seq)) { @@ -2987,14 +2986,10 @@ } } -static void yaz_close_link (zend_rsrc_list_entry *rsrc -#ifdef TSRMLS_DC - TSRMLS_DC -#endif -) +static void yaz_close_link (zend_rsrc_list_entry *rsrc TSRMLS_DC) { Yaz_Association *as = (Yaz_Association *) rsrc->ptr; - yaz_close_session (as); + yaz_close_session (as TSRMLS_CC); } /* {{{ PHP_INI_BEGIN Index: php4/ext/yaz/php_yaz.h diff -u php4/ext/yaz/php_yaz.h:1.12 php4/ext/yaz/php_yaz.h:1.13 --- php4/ext/yaz/php_yaz.h:1.12 Thu Jul 11 09:04:02 2002 +++ php4/ext/yaz/php_yaz.h Fri Jul 12 07:45:04 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.h,v 1.12 2002/07/11 13:04:02 dickmeiss Exp $ */ +/* $Id: php_yaz.h,v 1.13 2002/07/12 11:45:04 sniper Exp $ */ #ifndef PHP_YAZ_H #define PHP_YAZ_H @@ -60,7 +60,7 @@ ZEND_END_MODULE_GLOBALS(yaz) #ifdef ZTS -#define YAZSG(v) TSRMG(yaz_globals_id, zend_yaz_globals *. v) +#define YAZSG(v) TSRMG(yaz_globals_id, zend_yaz_globals *, v) #else #define YAZSG(v) (yaz_globals.v) #endif