cvs: php4 /ext/recode php_recode.h recode.c

wez Mon Mar 18 06:46:01 2002 EDT Modified files: /php4/ext/recode php_recode.h recode.c Log: Fix build. Warning about TSRM testing still applies. Index: php4/ext/recode/php_recode.h diff -u php4/ext/recode/php_recode.h:1.11 php4/ext/recode/php_recode.h:1.12 --- php4/ext/recode/php_recode.h:1.11 Thu Feb 28 03:26:39 2002 +++ php4/ext/recode/php_recode.h Mon Mar 18 06:46:00 2002 @@ -17,7 +17,7 @@ */ -/* $Id: php_recode.h,v 1.11 2002/02/28 08:26:39 sebastian Exp $ */ +/* $Id: php_recode.h,v 1.12 2002/03/18 11:46:00 wez Exp $ */ #ifndef PHP_RECODE_H #define PHP_RECODE_H @@ -61,19 +61,20 @@ PHP_FUNCTION(recode_string); PHP_FUNCTION(recode_file); -typedef struct { +#ifdef ZTS +#include "TSRM.h" +#endif + +ZEND_BEGIN_MODULE_GLOBALS(recode) RECODE_OUTER outer; -} php_recode_globals; +ZEND_END_MODULE_GLOBALS(recode) #ifdef ZTS -# define ReSG(v) TSRMG(recode_globals_id, php_recode_globals *, v) +#define ReSG(v) TSRMG(recode_globals_id, zend_recode_globals *, v) #else -# define ReSG(v) (recode_globals.v) -extern PHP_MYSQL_API php_recode_globals recode_globals; +#define ReSG(v) (recode_globals.v) #endif -#else -#define phpext_recode_ptr NULL #endif - + #endif /* PHP_RECODE_H */ Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.23 php4/ext/recode/recode.c:1.24 --- php4/ext/recode/recode.c:1.23 Fri Mar 15 20:28:08 2002 +++ php4/ext/recode/recode.c Mon Mar 18 06:46:00 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.23 2002/03/16 01:28:08 wez Exp $ */ +/* $Id: recode.c,v 1.24 2002/03/18 11:46:00 wez Exp $ */ /* {{{ includes & prototypes */ @@ -43,7 +43,7 @@ #define SAFE_STRING(s) ((s)?(s):"") -php_recode_globals recode_globals; +ZEND_DECLARE_MODULE_GLOBALS(recode); extern int le_fp,le_pp; /* {{{ module stuff */ @@ -98,7 +98,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.23 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.24 $"); php_info_print_table_end(); }