]> granicus.if.org Git - php/commitdiff
- Patch from Jason Greene.
authorAndi Gutmans <andi@php.net>
Thu, 19 Apr 2001 17:51:23 +0000 (17:51 +0000)
committerAndi Gutmans <andi@php.net>
Thu, 19 Apr 2001 17:51:23 +0000 (17:51 +0000)
- Make it easier to write PHP function definitions in more than just one .c
  file while accessing the same module globals.

Zend/zend_API.h

index 2ad161ea6b2831c1a9a4589e47d2b2625fa5ca8c..38717a4577caeaa91d74a4ddee0adcf78913397d 100644 (file)
 #ifdef ZTS
 
 #define ZEND_DECLARE_MODULE_GLOBALS(module_name)                                                       \
-       static ts_rsrc_id module_name##_globals_id;
+       ts_rsrc_id module_name##_globals_id;
+#define ZEND_EXTERN_MODULE_GLOBALS(module_name)                                                                \
+       extern ts_rsrc_id module_name##_globals_id;
 #define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)      \
        module_name##_globals_id = ts_allocate_id(sizeof(zend_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor);
 
 #else
 
 #define ZEND_DECLARE_MODULE_GLOBALS(module_name)                                                       \
-       static zend_##module_name##_globals module_name##_globals;
+       zend_##module_name##_globals module_name##_globals;
+#define ZEND_EXTERN_MODULE_GLOBALS(module_name)                                                                \
+       extern zend_##module_name##_globals module_name##_globals;
 #define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)      \
        globals_ctor(&module_name##_globals);