|
35 | 35 | #include "zend_smart_string.h"
|
36 | 36 |
|
37 | 37 | #ifdef ZTS
|
| 38 | +ZEND_API int compiler_globals_id; |
| 39 | +ZEND_API int executor_globals_id; |
| 40 | +static HashTable *global_function_table = NULL; |
| 41 | +static HashTable *global_class_table = NULL; |
| 42 | +static HashTable *global_constants_table = NULL; |
| 43 | +static HashTable *global_auto_globals_table = NULL; |
| 44 | +static HashTable *global_persistent_list = NULL; |
| 45 | +ZEND_TSRMLS_CACHE_DEFINE() |
38 | 46 | # define GLOBAL_FUNCTION_TABLE global_function_table
|
39 | 47 | # define GLOBAL_CLASS_TABLE global_class_table
|
40 | 48 | # define GLOBAL_CONSTANTS_TABLE global_constants_table
|
|
46 | 54 | # define GLOBAL_CONSTANTS_TABLE EG(zend_constants)
|
47 | 55 | #endif
|
48 | 56 |
|
| 57 | +ZEND_API zend_utility_values zend_uv; |
| 58 | + |
| 59 | +/* version information */ |
| 60 | +static char *zend_version_info; |
| 61 | +static uint32_t zend_version_info_length; |
| 62 | +#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2017 Zend Technologies\n" |
| 63 | +#define PRINT_ZVAL_INDENT 4 |
| 64 | + |
49 | 65 | /* true multithread-shared globals */
|
50 | 66 | ZEND_API zend_class_entry *zend_standard_class_def = NULL;
|
51 | 67 | ZEND_API size_t (*zend_printf)(const char *format, ...);
|
@@ -140,26 +156,6 @@ ZEND_INI_BEGIN()
|
140 | 156 | #endif
|
141 | 157 | ZEND_INI_END()
|
142 | 158 |
|
143 |
| - |
144 |
| -#ifdef ZTS |
145 |
| -ZEND_API int compiler_globals_id; |
146 |
| -ZEND_API int executor_globals_id; |
147 |
| -static HashTable *global_function_table = NULL; |
148 |
| -static HashTable *global_class_table = NULL; |
149 |
| -static HashTable *global_constants_table = NULL; |
150 |
| -static HashTable *global_auto_globals_table = NULL; |
151 |
| -static HashTable *global_persistent_list = NULL; |
152 |
| -ZEND_TSRMLS_CACHE_DEFINE() |
153 |
| -#endif |
154 |
| - |
155 |
| -ZEND_API zend_utility_values zend_uv; |
156 |
| - |
157 |
| -/* version information */ |
158 |
| -static char *zend_version_info; |
159 |
| -static uint32_t zend_version_info_length; |
160 |
| -#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2017 Zend Technologies\n" |
161 |
| -#define PRINT_ZVAL_INDENT 4 |
162 |
| - |
163 | 159 | ZEND_API size_t zend_vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap) /* {{{ */
|
164 | 160 | {
|
165 | 161 | smart_string buf = {0};
|
|
0 commit comments