summaryrefslogtreecommitdiff
path: root/Zend/zend_constants.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2001-12-12 20:45:38 +0000
committerAndi Gutmans <andi@php.net>2001-12-12 20:45:38 +0000
commitce98c73f8270a5a8cbe72f5ba0213c6cab0ce51a (patch)
treeb61e2ef5d65bf363ceee8365fb95ffc6150d8945 /Zend/zend_constants.c
parent6bd64164d526c9dc58fd056ad256c2efb5b330a2 (diff)
downloadphp-git-ce98c73f8270a5a8cbe72f5ba0213c6cab0ce51a.tar.gz
- Infrastructure changes for allowing to access the global scope from
- within a class scope. - Fix the Zend.dsp project a bit. It seems someone pretty much killed it - when commiting their own personal configuration. Please be careful in - future.
Diffstat (limited to 'Zend/zend_constants.c')
-rw-r--r--Zend/zend_constants.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index b0169d72e1..8976543d52 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -90,7 +90,7 @@ int zend_startup_constants(TSRMLS_D)
DWORD dwWindowsMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
#endif
- EG(zend_constants) = (HashTable *) malloc(sizeof(HashTable));
+ EG(zend_constants) = &CG(main_class).constants_table;
if (zend_hash_init(EG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1)==FAILURE) {
return FAILURE;
@@ -153,7 +153,6 @@ void zend_register_standard_constants(TSRMLS_D)
int zend_shutdown_constants(TSRMLS_D)
{
zend_hash_destroy(EG(zend_constants));
- free(EG(zend_constants));
return SUCCESS;
}