cvs: ZendEngine2 / zend_API.h zend_compile.c

helly Sun Dec 28 10:18:06 2003 EDT Modified files: /ZendEngine2 zend_API.h zend_compile.c Log: Fix order of class_entry member initialization (needed for example for DOM) # You need to completley rebuild PHP after this patch. Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.173 ZendEngine2/zend_API.h:1.174 --- ZendEngine2/zend_API.h:1.173 Mon Dec 22 08:09:15 2003 +++ ZendEngine2/zend_API.h Sun Dec 28 10:18:05 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.173 2003/12/22 13:09:15 wez Exp $ */ +/* $Id: zend_API.h,v 1.174 2003/12/28 15:18:05 helly Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -127,7 +127,9 @@ class_container.__call = handle_fcall; \ class_container.__get = handle_propget; \ class_container.__set = handle_propset; \ + class_container.parent = NULL; \ class_container.num_interfaces = 0; \ + class_container.interfaces = NULL; \ class_container.get_iterator = NULL; \ class_container.iterator_funcs.funcs = NULL; \ } Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.505 ZendEngine2/zend_compile.c:1.506 --- ZendEngine2/zend_compile.c:1.505 Mon Dec 22 17:34:28 2003 +++ ZendEngine2/zend_compile.c Sun Dec 28 10:18:05 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.505 2003/12/22 22:34:28 helly Exp $ */ +/* $Id: zend_compile.c,v 1.506 2003/12/28 15:18:05 helly Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -3565,14 +3565,13 @@ ce->__set = NULL; ce->__call = NULL; ce->create_object = NULL; + ce->get_iterator = NULL; + ce->iterator_funcs.funcs = NULL; + ce->interface_gets_implemented = NULL; + ce->parent = NULL; + ce->num_interfaces = 0; + ce->interfaces = NULL; } - - ce->parent = NULL; - ce->num_interfaces = 0; - ce->interfaces = NULL; - ce->get_iterator = NULL; - ce->iterator_funcs.funcs = NULL; - ce->interface_gets_implemented = NULL; }