From: Sebastian Bergmann <sebastian@php.net>
Date: Mon, 2 Jun 2003 15:42:34 +0000 (+0000)
Subject: Leftover.
X-Git-Tag: RELEASE_1_0_2~456
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fe874fbb80d2603959c020cb8625ea2b05bf160;p=php

Leftover.
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 4a550ba6f1..07d86bd5ac 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -598,9 +598,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 
 	zend_hash_destroy(executor_globals->zend_constants);
 	*executor_globals->zend_constants = *GLOBAL_CONSTANTS_TABLE;
-
-	CG(global_namespace).name = NULL;
-	CG(global_namespace).name_length = 0;
 #else
 	zend_hash_init_ex(CG(auto_globals), 8, NULL, (dtor_func_t) zend_auto_global_dtor, 1, 0);
 	scanner_globals_ctor(&ini_scanner_globals TSRMLS_CC);
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index b5cb9d5f63..05def92ee3 100644
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -274,11 +274,7 @@ PHP_MINIT_FUNCTION(tokenizer)
 	REGISTER_LONG_CONSTANT("T_ABSTRACT", T_ABSTRACT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_CATCH", T_CATCH, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_FINAL", T_FINAL, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("T_FROM", T_FROM, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("T_IMPORT", T_IMPORT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_INSTANCEOF", T_INSTANCEOF, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("T_NAMESPACE", T_NAMESPACE, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("T_NAMESPACE_NAME", T_NAMESPACE_NAME, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_PRIVATE", T_PRIVATE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_PROTECTED", T_PROTECTED, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("T_PUBLIC", T_PUBLIC, CONST_CS | CONST_PERSISTENT);
@@ -486,11 +482,7 @@ get_token_type_name(int token_type)
 		case T_ABSTRACT: return "T_ABSTRACT";
 		case T_CATCH: return "T_CATCH";
 		case T_FINAL: return "T_FINAL";
-		case T_FROM: return "T_FROM";
-		case T_IMPORT: return "T_IMPORT";
 		case T_INSTANCEOF: return "T_INSTANCEOF";
-		case T_NAMESPACE: return "T_NAMESPACE";
-		case T_NAMESPACE_NAME: return "T_NAMESPACE_NAME";
 		case T_PRIVATE: return "T_PRIVATE";
 		case T_PROTECTED: return "T_PROTECTED";
 		case T_PUBLIC: return "T_PUBLIC";