Get ext_skel working again

diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
index 11af41e00f41792a56923d180d9b697d18ff039e..2fadf2b08704d40e2f4490f08431260110f84179 100644 (file)
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -26,17 +26,14 @@ PHP_MINFO_FUNCTION(extname);
 PHP_FUNCTION(confirm_extname_compiled);        /* For testing, remove later. */
 /* __function_declarations_here__ */
 
-/* Fill in this structure and use entries in it
-   for thread safety instead of using true globals.
+/* 
+       Declare any global variables you may need between the BEGIN
+       and END macros here:     
+
+ZEND_BEGIN_MODULE_GLOBALS(extname)
+       int global_variable;
+ZEND_END_MODULE_GLOBALS(extname)
 */
-typedef struct {
-       /* You can use the next one as type if your module registers any
-          resources. Oh, you can of course rename it to something more
-          suitable, add list entry types or remove it if it not needed.
-          It's just an example.
-       */
-       int le_extname;
-} php_extname_globals;
 
 /* In every function that needs to use variables in php_extname_globals,
    do call EXTNAMELS_FETCH(); after declaring other variables used by

diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index b40b8424db69338adcb396b1cc15c9140c4f34b6..5bb696ae61d44f87caeac57e0102f77456f31852 100644 (file)
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -9,7 +9,12 @@
 */
 #if HAVE_EXTNAME
 
+/* If you declare any globals in php_extname.h uncomment this:
 ZEND_DECLARE_MODULE_GLOBALS(extname)
+*/
+
+/* True global resources - no need for thread safety here */
+static int le_extname;
 
 /* Every user visible function must have an entry in extname_functions[].
 */