diff options
| author | Andi Gutmans <andi@php.net> | 2001-09-26 07:00:42 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-09-26 07:00:42 +0000 |
| commit | 04a5b55238ea5143ba5ade2ee0db64e52274ac01 (patch) | |
| tree | ba6fb5fea374aea6ad96e32adc047474815a121d | |
| parent | da339a6eae2e7faa44abc512d0f1be5dc897dba5 (diff) | |
| download | php-git-04a5b55238ea5143ba5ade2ee0db64e52274ac01.tar.gz | |
- Good catch by Sterling
| -rw-r--r-- | Zend/zend.c | 4 | ||||
| -rw-r--r-- | Zend/zend.h | 4 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 6 | ||||
| -rw-r--r-- | Zend/zend_execute.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 6ce4f44fc1..b5c8de9ad4 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -434,13 +434,13 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i zend_hash_init_ex(GLOBAL_NAMESPACES_TABLE, 8, NULL, NULL, 1, 0); { - Namespace main_namespace; + zend_namespace main_namespace; main_namespace.type = INTERNAL_NAMESPACE; main_namespace.class_table = GLOBAL_CLASS_TABLE; main_namespace.function_table = GLOBAL_FUNCTION_TABLE; - zend_hash_update(GLOBAL_NAMESPACES_TABLE, "", sizeof(""), &main_namespace, sizeof(Namespace), NULL); + zend_hash_update(GLOBAL_NAMESPACES_TABLE, "", sizeof(""), &main_namespace, sizeof(zend_namespace), NULL); } register_standard_class(); diff --git a/Zend/zend.h b/Zend/zend.h index 6b54bfabea..8169ff329c 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -173,11 +173,11 @@ typedef enum { USER_NAMESPACE = 1 } namespace_type; -typedef struct _Namespace_struct { +typedef struct _zend_namespace_struct { namespace_type type; HashTable *class_table; HashTable *function_table; -} Namespace; +} zend_namespace; /* * zval diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 04ccfd4013..4afdea8939 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2349,7 +2349,7 @@ void zend_do_end_heredoc(TSRMLS_D) void do_namespace(znode *namespace TSRMLS_DC) { - Namespace *namespace_ptr; + zend_namespace *namespace_ptr; zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC); @@ -2365,7 +2365,7 @@ void do_namespace(znode *namespace TSRMLS_DC) SET_UNUSED(opline->op2); if (zend_hash_find(CG(namespaces), CG(namespace), CG(namespace_len)+1, (void **) &namespace_ptr) == FAILURE) { - Namespace new_namespace; + zend_namespace new_namespace; HashTable *new_function_table; HashTable *new_class_table; @@ -2377,7 +2377,7 @@ void do_namespace(znode *namespace TSRMLS_DC) new_namespace.function_table = new_function_table; new_namespace.class_table = new_class_table; - zend_hash_update(CG(namespaces), CG(namespace), CG(namespace_len)+1, &new_namespace, sizeof(Namespace), NULL); + zend_hash_update(CG(namespaces), CG(namespace), CG(namespace_len)+1, &new_namespace, sizeof(zend_namespace), NULL); CG(function_table) = new_function_table; CG(class_table) = new_class_table; } else { diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c2161d4e57..9b1bc63161 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1759,7 +1759,7 @@ do_fcall_common: NEXT_OPCODE(); case ZEND_NAMESPACE: { - Namespace *namespace_ptr; + zend_namespace *namespace_ptr; if (zend_hash_find(EG(namespaces), opline->op1.u.constant.value.str.val, opline->op1.u.constant.value.str.len + 1, (void **) &namespace_ptr) == FAILURE) { zend_error(E_ERROR, "Internal namespaces error. Please report this!"); |