Clean up php3.*\.h files. The files itself are renamed, and references in all

.*\.[ch] files were changed. There is a slight chance that my script missed
a few changes, please correct them manually.

7 files changed, 49 insertions, 19 deletions

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index dfa084a0c0..2e0d317446 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -41,9 +41,9 @@
 #endif
 
 #include "safe_mode.h"
-#include "php3_realpath.h"
+#include "php_realpath.h"
 #include "ext/standard/head.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "zend_compile.h"
 
 #if HAVE_PWD_H
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index ba08ce6e39..244303d9d3 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -29,21 +29,21 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "ext/bcmath/php3_bcmath.h"
-#include "ext/db/php3_db.h"
-#include "ext/gd/php3_gd.h"
+#include "ext/bcmath/php_bcmath.h"
+#include "ext/db/php_db.h"
+#include "ext/gd/php_gd.h"
 #include "ext/standard/dl.h"
 #include "ext/standard/file.h"
 #include "ext/standard/fsock.h"
 #include "ext/standard/head.h"
 #include "ext/standard/pack.h"
-#include "ext/standard/php3_browscap.h"
-#include "ext/standard/php3_crypt.h"
-#include "ext/standard/php3_dir.h"
-#include "ext/standard/php3_filestat.h"
-#include "ext/standard/php3_mail.h"
-#include "ext/standard/php3_syslog.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_browscap.h"
+#include "ext/standard/php_crypt.h"
+#include "ext/standard/php_dir.h"
+#include "ext/standard/php_filestat.h"
+#include "ext/standard/php_mail.h"
+#include "ext/standard/php_syslog.h"
+#include "ext/standard/php_standard.h"
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/php_output.h"
 #include "ext/standard/php_array.h"
@@ -54,7 +54,7 @@
 #include "ext/session/php_session.h"
 
 /* SNMP has to be moved to ext */
-/* #include "dl/snmp/php3_snmp.h" */
+/* #include "dl/snmp/php_snmp.h" */
 
 unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE };
 unsigned char first_arg_allow_ref[] = { 1, BYREF_ALLOW };
diff --git a/main/main.c b/main/main.c
index 24a93f6ff1..892da7a1ae 100644
--- a/main/main.c
+++ b/main/main.c
@@ -48,7 +48,7 @@
 #include "php_globals.h"
 #include "main.h"
 #include "fopen-wrappers.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>
diff --git a/main/php.h b/main/php.h
index 47f0f367c8..031c168596 100644
--- a/main/php.h
+++ b/main/php.h
@@ -148,7 +148,7 @@ char *strtok_r(char *s, const char *delim, char **last);
 
 
 #include "zend_hash.h"
-#include "php3_compat.h"
+#include "php_compat.h"
 #include "zend_alloc.h"
 #include "zend_stack.h"
 
diff --git a/main/php3_compat.h b/main/php_compat.h
index f6e60bea71..be0a5fa281 100644
--- a/main/php3_compat.h
+++ b/main/php_compat.h
@@ -1,5 +1,5 @@
-#ifndef _PHP3_COMPAT_H
-#define _PHP3_COMPAT_H
+#ifndef _PHP_COMPAT_H
+#define _PHP_COMPAT_H
 
 #define _php3_hash_init zend_hash_init
 #define _php3_hash_destroy zend_hash_destroy
@@ -90,4 +90,4 @@
 #define _php3_stripslashes	php_stripslashes
 #define php3_dl             php_dl
 
-#endif							/* _PHP3_COMPAT_H */
+#endif							/* _PHP_COMPAT_H */
diff --git a/main/php_realpath.h b/main/php_realpath.h
new file mode 100644
index 0000000000..92ecdf8574
--- /dev/null
+++ b/main/php_realpath.h
@@ -0,0 +1,30 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997, 1998, 1999 The PHP Group                         |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.0 of the PHP license,       |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_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: Sander Steffann (sander@steffann.nl)                         |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef _PHP_REALPATH_H_
+#define _PHP_REALPATH_H_
+
+extern char *_php3_realpath(const char *path, char resolved_path []);
+
+#endif
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 9ab9420f6f..2ddd66d467 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "ext/standard/file.h" /* for php_file_le_uploads() */
 #include "zend_globals.h"
 #include "php_globals.h"