- Make classes have scope and function/constant lookups default to the class

1 files changed, 0 insertions, 11 deletions

diff --git a/Zend/zend.h b/Zend/zend.h
index b40eb67faf..c869f7fecf 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -183,16 +183,6 @@ typedef unsigned short zend_ushort;
 #define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval *this_ptr, int return_value_used TSRMLS_DC
 #define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, this_ptr, return_value_used TSRMLS_CC
 
-typedef enum {
-	INTERNAL_NAMESPACE = 0,
-	USER_NAMESPACE = 1	
-} namespace_type;
-
-typedef struct _zend_namespace_struct {
-	namespace_type type;
-	HashTable *class_table;
-	HashTable *function_table;
-} zend_namespace;
 
 /*
  * zval
@@ -292,7 +282,6 @@ struct _zend_class_entry {
 	struct _zend_class_entry *parent; 
 	int *refcount;
 	zend_bool constants_updated;
-	zend_bool is_namespace;
 
 	HashTable function_table;
 	HashTable default_properties;