sniper Mon Dec 5 19:44:22 2005 EDT
Removed files:
/php-src/main php3_compat.h
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/main php.h
/php-src/win32 php5dll.dsp php5dllts.dsp
Log:
- Nuke php3_compat.h
http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.195&r2=1.196&ty=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.195
php-src/ext/reflection/php_reflection.c:1.196
--- php-src/ext/reflection/php_reflection.c:1.195 Thu Dec 1 06:49:51 2005
+++ php-src/ext/reflection/php_reflection.c Mon Dec 5 19:44:21 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.195 2005/12/01 11:49:51 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.196 2005/12/06 00:44:21 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -39,11 +39,6 @@
#include "zend_ini.h"
#include "zend_interfaces.h"
-/* Undefine "getParameters" macro defined in "main/php3_compat.h" */
-#ifdef getParameters
-# undef getParameters
-#endif
-
/* Class entry pointers */
PHPAPI zend_class_entry *reflector_ptr;
PHPAPI zend_class_entry *reflection_exception_ptr;
@@ -4277,7 +4272,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.195
2005/12/01 11:49:51 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.196
2005/12/06 00:44:21 sniper Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.223&r2=1.224&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.223 php-src/main/php.h:1.224
--- php-src/main/php.h:1.223 Thu Aug 11 19:36:04 2005
+++ php-src/main/php.h Mon Dec 5 19:44:21 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.223 2005/08/11 23:36:04 andrei Exp $ */
+/* $Id: php.h,v 1.224 2005/12/06 00:44:21 sniper Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -170,12 +170,14 @@
# endif
#endif
-
#include "zend_hash.h"
-#include "php3_compat.h"
#include "zend_alloc.h"
#include "zend_stack.h"
+/* PHP3 Legacy */
+typedef zval pval;
+#define function_entry zend_function_entry
+
#if STDC_HEADERS
# include <string.h>
#else
http://cvs.php.net/diff.php/php-src/win32/php5dll.dsp?r1=1.3&r2=1.4&ty=u
Index: php-src/win32/php5dll.dsp
diff -u php-src/win32/php5dll.dsp:1.3 php-src/win32/php5dll.dsp:1.4
--- php-src/win32/php5dll.dsp:1.3 Sun Jun 19 18:15:27 2005
+++ php-src/win32/php5dll.dsp Mon Dec 5 19:44:22 2005
@@ -276,10 +276,6 @@
# End Source File
# Begin Source File
-SOURCE=..\main\php3_compat.h
-# End Source File
-# Begin Source File
-
SOURCE=..\main\php_content_types.h
# End Source File
# Begin Source File
http://cvs.php.net/diff.php/php-src/win32/php5dllts.dsp?r1=1.6&r2=1.7&ty=u
Index: php-src/win32/php5dllts.dsp
diff -u php-src/win32/php5dllts.dsp:1.6 php-src/win32/php5dllts.dsp:1.7
--- php-src/win32/php5dllts.dsp:1.6 Sun Jun 19 18:15:27 2005
+++ php-src/win32/php5dllts.dsp Mon Dec 5 19:44:22 2005
@@ -297,10 +297,6 @@
# End Source File
# Begin Source File
-SOURCE=..\main\php3_compat.h
-# End Source File
-# Begin Source File
-
SOURCE=..\main\php_compat.h
# End Source File
# Begin Source File
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
