Deleted Added
full compact
zend_modules.h (6c810b0d) zend_modules.h (8146078f)
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2007 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 74 unchanged lines hidden (view full) ---

83 const struct _zend_module_dep *deps;
84 const char *name;
85 const struct _zend_function_entry *functions;
86 int (*module_startup_func)(INIT_FUNC_ARGS);
87 int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS);
88 int (*request_startup_func)(INIT_FUNC_ARGS);
89 int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS);
90 void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS);
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2007 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 74 unchanged lines hidden (view full) ---

83 const struct _zend_module_dep *deps;
84 const char *name;
85 const struct _zend_function_entry *functions;
86 int (*module_startup_func)(INIT_FUNC_ARGS);
87 int (*module_shutdown_func)(SHUTDOWN_FUNC_ARGS);
88 int (*request_startup_func)(INIT_FUNC_ARGS);
89 int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS);
90 void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS);
91 const char *version;
91 char *version;
92 size_t globals_size;
93#ifdef ZTS
94 ts_rsrc_id* globals_id_ptr;
95#else
96 void* globals_ptr;
97#endif
98 void (*globals_ctor)(void *global TSRMLS_DC);
99 void (*globals_dtor)(void *global TSRMLS_DC);

--- 12 unchanged lines hidden (view full) ---

112#define ZEND_MOD_CONFLICTS_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_CONFLICTS },
113#define ZEND_MOD_OPTIONAL_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_OPTIONAL },
114
115#define ZEND_MOD_REQUIRED(name) ZEND_MOD_REQUIRED_EX(name, NULL, NULL)
116#define ZEND_MOD_CONFLICTS(name) ZEND_MOD_CONFLICTS_EX(name, NULL, NULL)
117#define ZEND_MOD_OPTIONAL(name) ZEND_MOD_OPTIONAL_EX(name, NULL, NULL)
118
119struct _zend_module_dep {
92 size_t globals_size;
93#ifdef ZTS
94 ts_rsrc_id* globals_id_ptr;
95#else
96 void* globals_ptr;
97#endif
98 void (*globals_ctor)(void *global TSRMLS_DC);
99 void (*globals_dtor)(void *global TSRMLS_DC);

--- 12 unchanged lines hidden (view full) ---

112#define ZEND_MOD_CONFLICTS_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_CONFLICTS },
113#define ZEND_MOD_OPTIONAL_EX(name, rel, ver) { name, rel, ver, MODULE_DEP_OPTIONAL },
114
115#define ZEND_MOD_REQUIRED(name) ZEND_MOD_REQUIRED_EX(name, NULL, NULL)
116#define ZEND_MOD_CONFLICTS(name) ZEND_MOD_CONFLICTS_EX(name, NULL, NULL)
117#define ZEND_MOD_OPTIONAL(name) ZEND_MOD_OPTIONAL_EX(name, NULL, NULL)
118
119struct _zend_module_dep {
120 const char *name; /* module name */
121 const char *rel; /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */
122 const char *version; /* version */
123 unsigned char type; /* dependency type */
120 char *name; /* module name */
121 char *rel; /* version relationship: NULL (exists), lt|le|eq|ge|gt (to given version) */
122 char *version; /* version */
123 unsigned char type; /* dependency type */
124};
125
126extern ZEND_API HashTable module_registry;
127
128void module_destructor(zend_module_entry *module);
129int module_registry_cleanup(zend_module_entry *module TSRMLS_DC);
130int module_registry_request_startup(zend_module_entry *module TSRMLS_DC);
131int module_registry_unload_temp(zend_module_entry *module TSRMLS_DC);
132
133#define ZEND_MODULE_DTOR (void (*)(void *)) module_destructor
134#endif
135
136/*
137 * Local variables:
138 * tab-width: 4
139 * c-basic-offset: 4
140 * indent-tabs-mode: t
141 * End:
142 */
124};
125
126extern ZEND_API HashTable module_registry;
127
128void module_destructor(zend_module_entry *module);
129int module_registry_cleanup(zend_module_entry *module TSRMLS_DC);
130int module_registry_request_startup(zend_module_entry *module TSRMLS_DC);
131int module_registry_unload_temp(zend_module_entry *module TSRMLS_DC);
132
133#define ZEND_MODULE_DTOR (void (*)(void *)) module_destructor
134#endif
135
136/*
137 * Local variables:
138 * tab-width: 4
139 * c-basic-offset: 4
140 * indent-tabs-mode: t
141 * End:
142 */