- Nuke php3_compat.h

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index d15f156b63a43ac06a408777407517b3526269a2..259e74384a8b455ef02a90671c5b75b3710ea6f0 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -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;

diff --git a/main/php.h b/main/php.h
index 1ad05e46ce8f19f74c767909d3545ab374152b3a..d3e13a181edfc00c0c00d40895373475c3797f38 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -170,12 +170,14 @@ typedef unsigned int socklen_t;
 # 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

diff --git a/main/php3_compat.h b/main/php3_compat.h
deleted file mode 100644 (file)
index 43f0367..0000000
--- a/main/php3_compat.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-  +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2005 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.0 of the PHP license,       |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_0.txt.                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author:                                                              |
-  +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP3_COMPAT_H
-#define PHP3_COMPAT_H
-
-typedef zval pval;
-
-#define pval_copy_constructor zval_copy_ctor
-#define pval_destructor        zval_dtor
-
-#define _php3_hash_init zend_hash_init
-#define _php3_hash_destroy zend_hash_destroy
-
-#define _php3_hash_clean zend_hash_clean
-
-#define _php3_hash_add_or_update zend_hash_add_or_update
-#define _php3_hash_add zend_hash_add
-#define _php3_hash_update zend_hash_update
-
-#define _php3_hash_quick_add_or_update zend_hash_quick_add_or_update
-#define _php3_hash_quick_add zend_hash_quick_add
-#define _php3_hash_quick_update zend_hash_quick_update
-
-#define _php3_hash_index_update_or_next_insert zend_hash_index_update_or_next_insert
-#define _php3_hash_index_update zend_hash_index_update
-#define _php3_hash_next_index_insert zend_hash_next_index_insert
-
-#define _php3_hash_pointer_update zend_hash_pointer_update
-
-#define _php3_hash_pointer_index_update_or_next_insert zend_hash_pointer_index_update_or_next_insert
-#define _php3_hash_pointer_index_update zend_hash_pointer_index_update
-#define _php3_hash_next_index_pointer_update zend_hash_next_index_pointer_update
-#define _php3_hash_next_index_pointer_insert zend_hash_next_index_pointer_insert
-
-#define _php3_hash_del_key_or_index zend_hash_del_key_or_index
-#define _php3_hash_del zend_hash_del
-#define _php3_hash_index_del zend_hash_index_del
-
-#define _php3_hash_find zend_hash_find
-#define _php3_hash_quick_find zend_hash_quick_find
-#define _php3_hash_index_find zend_hash_index_find
-
-#define _php3_hash_exists zend_hash_exists
-#define _php3_hash_index_exists zend_hash_index_exists
-#define _php3_hash_is_pointer zend_hash_is_pointer
-#define _php3_hash_index_is_pointer zend_hash_index_is_pointer
-#define _php3_hash_next_free_element zend_hash_next_free_element
-
-#define _php3_hash_move_forward zend_hash_move_forward
-#define _php3_hash_move_backwards zend_hash_move_backwards
-#define _php3_hash_get_current_key zend_hash_get_current_key
-#define _php3_hash_get_current_data zend_hash_get_current_data
-#define _php3_hash_internal_pointer_reset zend_hash_internal_pointer_reset
-#define _php3_hash_internal_pointer_end zend_hash_internal_pointer_end
-
-#define _php3_hash_copy zend_hash_copy
-#define _php3_hash_merge zend_hash_merge
-#define _php3_hash_sort zend_hash_sort
-#define _php3_hash_minmax zend_hash_minmax
-
-#define _php3_hash_num_elements zend_hash_num_elements
-
-#define _php3_hash_apply zend_hash_apply
-#define _php3_hash_apply_with_argument zend_hash_apply_with_argument
-
-
-#define php3_error php_error
-
-#define php3_printf php_printf
-#define _php3_sprintf php_sprintf
-
-
-
-#define php3_module_entry zend_module_entry
-
-#define php3_strndup           zend_strndup
-#define php3_str_tolower       zend_str_tolower
-#define php3_binary_strcmp     zend_binary_strcmp
-
-
-#define php3_list_insert       zend_list_insert
-#define php3_list_find         zend_list_find
-#define php3_list_delete       zend_list_delete
-
-#define php3_plist_insert      zend_plist_insert
-#define php3_plist_find                zend_plist_find
-#define php3_plist_delete      zend_plist_delete
-
-#define zend_print_pval                zend_print_zval
-#define zend_print_pval_r      zend_print_zval_r
-
-
-#define function_entry         zend_function_entry
-
-#define _php3_addslashes       php_addslashes
-#define _php3_stripslashes     php_stripslashes
-#define php3_dl             php_dl
-
-#define getParameters          zend_get_parameters
-#define getParametersArray     zend_get_parameters_array
-
-#define list_entry                     zend_rsrc_list_entry
-
-#endif                                                 /* PHP3_COMPAT_H */

diff --git a/win32/php5dll.dsp b/win32/php5dll.dsp
index 891a0438f00d738005d2ff6661c210345861aafd..c83e8d32411bed98f4af910d737f88b76110b239 100644 (file)
--- a/win32/php5dll.dsp
+++ b/win32/php5dll.dsp
@@ -276,10 +276,6 @@ SOURCE=..\main\php.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\php3_compat.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\main\php_content_types.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/win32/php5dllts.dsp b/win32/php5dllts.dsp
index 745d800f4fc613d1630b4897727c8623541971bc..527f0c1847b9c757ed4db04bc7f9fd255edb09dd 100644 (file)
--- a/win32/php5dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -297,10 +297,6 @@ SOURCE=..\main\php.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\php3_compat.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\main\php_compat.h\r
 # End Source File\r
 # Begin Source File\r