diff options
| author | Andrey Hristov <andrey@php.net> | 2004-01-17 17:44:27 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2004-01-17 17:44:27 +0000 |
| commit | 8b763f14b7b7ccd81d4698444770ee6e778130cc (patch) | |
| tree | ef69c93e433abdd9cc7dab838723899059e665f7 | |
| parent | 4ee7ba05bcd9db6381d1798820600efc29e13426 (diff) | |
| download | php-git-8b763f14b7b7ccd81d4698444770ee6e778130cc.tar.gz | |
HEAD is bundled with ZE2
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 14 | ||||
| -rw-r--r-- | ext/xml/xml.c | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 126c56cb1c..35db840b02 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -237,9 +237,6 @@ PHP_MINIT_FUNCTION(tokenizer) REGISTER_LONG_CONSTANT("T_DEFAULT", T_DEFAULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_BREAK", T_BREAK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_CONTINUE", T_CONTINUE, CONST_CS | CONST_PERSISTENT); -#ifndef ZEND_ENGINE_2 - REGISTER_LONG_CONSTANT("T_OLD_FUNCTION", T_OLD_FUNCTION, CONST_CS | CONST_PERSISTENT); -#endif REGISTER_LONG_CONSTANT("T_FUNCTION", T_FUNCTION, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_CONST", T_CONST, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_RETURN", T_RETURN, CONST_CS | CONST_PERSISTENT); @@ -252,10 +249,8 @@ PHP_MINIT_FUNCTION(tokenizer) REGISTER_LONG_CONSTANT("T_EMPTY", T_EMPTY, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_CLASS", T_CLASS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_EXTENDS", T_EXTENDS, CONST_CS | CONST_PERSISTENT); -#ifdef ZEND_ENGINE_2 REGISTER_LONG_CONSTANT("T_INTERFACE", T_INTERFACE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_IMPLEMENTS", T_IMPLEMENTS, CONST_CS | CONST_PERSISTENT); -#endif REGISTER_LONG_CONSTANT("T_OBJECT_OPERATOR", T_OBJECT_OPERATOR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DOUBLE_ARROW", T_DOUBLE_ARROW, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_LIST", T_LIST, CONST_CS | CONST_PERSISTENT); @@ -276,7 +271,6 @@ PHP_MINIT_FUNCTION(tokenizer) REGISTER_LONG_CONSTANT("T_CURLY_OPEN", T_CURLY_OPEN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_PAAMAYIM_NEKUDOTAYIM", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT); -#ifdef ZEND_ENGINE_2 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); @@ -286,7 +280,6 @@ PHP_MINIT_FUNCTION(tokenizer) REGISTER_LONG_CONSTANT("T_PUBLIC", T_PUBLIC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_THROW", T_THROW, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_TRY", T_TRY, CONST_CS | CONST_PERSISTENT); -#endif return SUCCESS; } @@ -455,9 +448,6 @@ get_token_type_name(int token_type) case T_DEFAULT: return "T_DEFAULT"; case T_BREAK: return "T_BREAK"; case T_CONTINUE: return "T_CONTINUE"; -#ifndef ZEND_ENGINE_2 - case T_OLD_FUNCTION: return "T_OLD_FUNCTION"; -#endif case T_FUNCTION: return "T_FUNCTION"; case T_CONST: return "T_CONST"; case T_RETURN: return "T_RETURN"; @@ -470,10 +460,8 @@ get_token_type_name(int token_type) case T_EMPTY: return "T_EMPTY"; case T_CLASS: return "T_CLASS"; case T_EXTENDS: return "T_EXTENDS"; -#ifdef ZEND_ENGINE_2 case T_INTERFACE: return "T_INTERFACE"; case T_IMPLEMENTS: return "T_IMPLEMENTS"; -#endif case T_OBJECT_OPERATOR: return "T_OBJECT_OPERATOR"; case T_DOUBLE_ARROW: return "T_DOUBLE_ARROW"; case T_LIST: return "T_LIST"; @@ -492,7 +480,6 @@ get_token_type_name(int token_type) case T_DOLLAR_OPEN_CURLY_BRACES: return "T_DOLLAR_OPEN_CURLY_BRACES"; case T_CURLY_OPEN: return "T_CURLY_OPEN"; case T_PAAMAYIM_NEKUDOTAYIM: return "T_DOUBLE_COLON"; -#ifdef ZEND_ENGINE_2 case T_DOC_COMMENT: return "T_DOC_COMMENT"; case T_ABSTRACT: return "T_ABSTRACT"; case T_CATCH: return "T_CATCH"; @@ -503,7 +490,6 @@ get_token_type_name(int token_type) case T_PUBLIC: return "T_PUBLIC"; case T_THROW: return "T_THROW"; case T_TRY: return "T_TRY"; -#endif } return "UNKNOWN"; } diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 376711503b..728a811f47 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1133,11 +1133,9 @@ PHP_FUNCTION(xml_set_object) ZEND_FETCH_RESOURCE(parser,xml_parser *,pind, -1, "XML Parser", le_xml_parser); /* please leave this commented - or ask thies@thieso.net before doing it (again) */ -#ifdef ZEND_ENGINE_2 if (parser->object) { zval_ptr_dtor(&parser->object); } -#endif parser->object = *mythis; |