Permalink
Browse files

This should enable people to use ALLOC_ZVAL() in code outside the php…

…4.dll
  • Loading branch information...
1 parent cf5a5fb commit 5864b57eeca950d78031ca6a3628a9d98e842d61 @zsuraski zsuraski committed Dec 30, 1999
Showing with 4 additions and 6 deletions.
  1. +1 −1 Zend/zend.c
  2. +1 −1 Zend/zend_alloc.c
  3. +0 −3 Zend/zend_fast_cache.h
  4. +1 −1 Zend/zend_globals.h
  5. +1 −0 Zend/zend_globals_macros.h
View
@@ -52,7 +52,7 @@ ZEND_API int (*zend_get_ini_entry)(char *name, uint name_length, zval *contents)
#ifdef ZTS
ZEND_API int compiler_globals_id;
ZEND_API int executor_globals_id;
-int alloc_globals_id;
+ZEND_API int alloc_globals_id;
HashTable *global_function_table;
HashTable *global_class_table;
HashTable *global_constants_table;
View
@@ -32,7 +32,7 @@
#endif
#ifndef ZTS
-zend_alloc_globals alloc_globals;
+ZEND_API zend_alloc_globals alloc_globals;
#endif
@@ -51,9 +51,6 @@ typedef struct _zend_fast_cache_list_entry {
# define RECORD_ZVAL_CACHE_MISS(fc_type)
#endif
-#ifndef ZTS
-extern zend_alloc_globals alloc_globals;
-#endif
#define ZEND_FAST_ALLOC(p, type, fc_type) \
{ \
View
@@ -45,7 +45,7 @@ class ZendFlexLexer;
BEGIN_EXTERN_C()
ZEND_API extern int compiler_globals_id;
ZEND_API extern int executor_globals_id;
-extern int alloc_globals_id;
+ZEND_API extern int alloc_globals_id;
END_EXTERN_C()
#endif
@@ -82,6 +82,7 @@ extern ZEND_API zend_executor_globals executor_globals;
# define ALS_CC
# define AG(v) (alloc_globals.v)
# define ALS_FETCH()
+extern ZEND_API zend_alloc_globals alloc_globals;
#endif
#endif /* _ZEND_GLOBALS_MACROS_H */

0 comments on commit 5864b57

Please sign in to comment.