Fix build.

Warning about TSRM testing still applies.

diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
index 641e7d10003f653b9570e604ac6dd46f75d9418d..dcdf4fd024bdae603cfa67f32e0378c386620c41 100644 (file)
--- a/ext/recode/php_recode.h
+++ b/ext/recode/php_recode.h
@@ -61,19 +61,20 @@ PHP_MINFO_FUNCTION(recode);
 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 */

diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index d552d765bebdeb76dbd1f3f10919129f01f9c9d2..f502827ef68f58a8cde1f906ce7311371fe94ae8 100644 (file)
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -43,7 +43,7 @@ char *program_name = "php";
 
 #define SAFE_STRING(s) ((s)?(s):"")
 
-php_recode_globals recode_globals;
+ZEND_DECLARE_MODULE_GLOBALS(recode);
 extern int le_fp,le_pp;
 
 /* {{{ module stuff */