andrey Sat Jan 17 12:44:28 2004 EDT
Modified files:
/php-src/ext/xml xml.c
/php-src/ext/tokenizer tokenizer.c
Log:
HEAD is bundled with ZE2
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.146 php-src/ext/xml/xml.c:1.147
--- php-src/ext/xml/xml.c:1.146 Fri Jan 16 14:11:33 2004
+++ php-src/ext/xml/xml.c Sat Jan 17 12:44:26 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.146 2004/01/16 19:11:33 sniper Exp $ */
+/* $Id: xml.c,v 1.147 2004/01/17 17:44:26 andrey Exp $ */
#define IS_EXT_MODULE
@@ -1133,11 +1133,9 @@
ZEND_FETCH_RESOURCE(parser,xml_parser *,pind, -1, "XML Parser", le_xml_parser);
/* please leave this commented - or ask [EMAIL PROTECTED] before doing it
(again) */
-#ifdef ZEND_ENGINE_2
if (parser->object) {
zval_ptr_dtor(&parser->object);
}
-#endif
parser->object = *mythis;
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.24 php-src/ext/tokenizer/tokenizer.c:1.25
--- php-src/ext/tokenizer/tokenizer.c:1.24 Thu Jan 8 03:17:42 2004
+++ php-src/ext/tokenizer/tokenizer.c Sat Jan 17 12:44:27 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tokenizer.c,v 1.24 2004/01/08 08:17:42 andi Exp $ */
+/* $Id: tokenizer.c,v 1.25 2004/01/17 17:44:27 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -237,9 +237,6 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
case T_PUBLIC: return "T_PUBLIC";
case T_THROW: return "T_THROW";
case T_TRY: return "T_TRY";
-#endif
}
return "UNKNOWN";
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
