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.

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index 2b19d533d4ca59494225ef6a02a2cc3fc2259a56..69f8db3fcb81830febe4abc56375f1fc853af62a 100644 (file)
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -28,7 +28,7 @@
 
 #if HAVE_ASPELL
 
-#include "php3_aspell.h"
+#include "php_aspell.h"
 #if APACHE
 #  ifndef DEBUG
 #  undef palloc

diff --git a/ext/aspell/php3_aspell.h b/ext/aspell/php_aspell.h
similarity index 100%
rename from ext/aspell/php3_aspell.h
rename to ext/aspell/php_aspell.h

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index d4a7032376a86b359857a9ff6cbf90b53776c4fe..e39f60244566e5e61acb73a766e142f6c2b0e673 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -21,7 +21,7 @@
 #if WITH_BCMATH
 
 #include "number.h"
-#include "php3_bcmath.h"
+#include "php_bcmath.h"
 
 function_entry bcmath_functions[] = {
        PHP_FE(bcadd,                                                                   NULL)

diff --git a/ext/bcmath/php3_bcmath.h b/ext/bcmath/php_bcmath.h
similarity index 97%
rename from ext/bcmath/php3_bcmath.h
rename to ext/bcmath/php_bcmath.h
index a6007e60d1bc4b9917d87f55f7bd94438a8475d6..397ff03dd5ec10980d5cce79222b80bf0e28240e 100644 (file)
--- a/ext/bcmath/php3_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_BCMATH_H
-#define _PHP3_BCMATH_H
+#ifndef _PHP_BCMATH_H
+#define _PHP_BCMATH_H
 
 #if COMPILE_DL
 #undef WITH_BCMATH
@@ -61,4 +61,4 @@ PHP_FUNCTION(bcscale);
 
 #endif
 
-#endif /* _PHP3_BCMATH_H */
+#endif /* _PHP_BCMATH_H */

diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index 2be6d57fc67d61615f6767820beab4e4247bf985..cacb476ef5f79881ed1bcc88b4485e7627ac26d4 100644 (file)
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -54,7 +54,7 @@
 #endif
 
 #if HAVE_CPDFLIB
-#include "php3_cpdf.h"
+#include "php_cpdf.h"
 
 #ifdef THREAD_SAFE
 DWORD CPDFlibTls;

diff --git a/ext/cpdf/php3_cpdf.h b/ext/cpdf/php_cpdf.h
similarity index 99%
rename from ext/cpdf/php3_cpdf.h
rename to ext/cpdf/php_cpdf.h
index 8269b2f24fe0f97bb09f7959aa08e5d3acf0f0ad..48823a92169ac382d84cbb1b4ebfe98ad8a31553 100644 (file)
--- a/ext/cpdf/php3_cpdf.h
+++ b/ext/cpdf/php_cpdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP3_CPDF_H
-#define _PHP3_CPDF_H
+#ifndef _PHP_CPDF_H
+#define _PHP_CPDF_H
 
 #if HAVE_CPDFLIB
 

diff --git a/ext/dav/dav.c b/ext/dav/dav.c
index 5ca8a390124719a517f4901450630c1a910d7967..0f8cd56a7a07d475463ac4664df68699a7475156 100644 (file)
--- a/ext/dav/dav.c
+++ b/ext/dav/dav.c
@@ -27,7 +27,7 @@
 # endif
 #endif
 #include "php.h"
-#include "php3_dav.h"
+#include "php_dav.h"
 
 #if defined(THREAD_SAFE) && !PHP_31
 # undef THREAD_SAFE

diff --git a/ext/dav/php3_dav.h b/ext/dav/php_dav.h
similarity index 100%
rename from ext/dav/php3_dav.h
rename to ext/dav/php_dav.h

diff --git a/ext/db/db.c b/ext/db/db.c
index 527e2c665b4c3412763c6580a5ec2afd44217fc5..c26d3aef571154c5588335827868424cb4ffe4c5 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -148,8 +148,8 @@ datum flatfile_nextkey(FILE *dbf);
 
 #endif
 
-#include "php3_db.h"
-#include "ext/standard/php3_string.h"
+#include "php_db.h"
+#include "ext/standard/php_string.h"
 
 #if THREAD_SAFE
 DWORD DbmTls;

diff --git a/ext/db/php3_db.h b/ext/db/php_db.h
similarity index 98%
rename from ext/db/php3_db.h
rename to ext/db/php_db.h
index 17069e6bcd0de86db96420666caacccc0f792917..30c8f809a37898294faec832e7e5ca5db1f342fe 100644 (file)
--- a/ext/db/php3_db.h
+++ b/ext/db/php_db.h
@@ -31,8 +31,8 @@
 /* $Id$ */
 
 
-#ifndef _PHP3_DB_H
-#define _PHP3_DB_H
+#ifndef _PHP_DB_H
+#define _PHP_DB_H
 
 
 #ifndef DLEXPORT
@@ -92,4 +92,4 @@ PHP_FUNCTION(dbmnextkey);
 #undef phpext_db_ptr
 #define phpext_db_ptr  NULL
 
-#endif /* _PHP3_DB_H */
+#endif /* _PHP_DB_H */

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index dd5eeb9cd2919fa8b45bf46215dcc8658ff55ae7..468d29d0ce0ed5dcbdcf29e60d16782046a14794 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -33,14 +33,14 @@
 
 #if HAVE_DBA
 
-#include "php3_dba.h"
-
-#include "php3_gdbm.h"
-#include "php3_ndbm.h"
-#include "php3_dbm.h"
-#include "php3_cdb.h"
-#include "php3_db2.h"
-#include "php3_db3.h"
+#include "php_dba.h"
+
+#include "php_gdbm.h"
+#include "php_ndbm.h"
+#include "php_dbm.h"
+#include "php_cdb.h"
+#include "php_db2.h"
+#include "php_db3.h"
 
 function_entry dba_functions[] = {
        PHP_FE(dba_open, NULL)

diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c
index 55683590c58e80e111b5fee92ee2b26404b54ae5..fa38de931b05af41c3417d9df6ce869d7951a5de 100644 (file)
--- a/ext/dba/dba_cdb.c
+++ b/ext/dba/dba_cdb.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_CDB
-#include "php3_cdb.h"
+#include "php_cdb.h"
 
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 77f010a7f2120306c18cfb5819300644ae72fa5c..b662a644aa8db0792bb1257d2f746f2ebf2ed16b 100644 (file)
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DB2
-#include "php3_db2.h"
+#include "php_db2.h"
 #include <sys/stat.h>
 
 #include <string.h>

diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index dece9634a4023e9969068219add73f3f610cf70a..38a206553784b214324c02f91f606ad8ed508780 100644 (file)
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DB3
-#include "php3_db3.h"
+#include "php_db3.h"
 #include <sys/stat.h>
 
 #include <string.h>

diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c
index b8b4ea95f2d37df2e8fa666fa2f2c246b4f74ced..0fab79f002d5173190db69b1d7c947cb1e7cdb4e 100644 (file)
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DBM
-#include "php3_dbm.h"
+#include "php_dbm.h"
 
 #include <dbm.h>
 

diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c
index 6fde65ec73405acbf4a5e4f360368e24b38ef221..fd345997d9417ad8e8bd182e9e11868caf7d6d07 100644 (file)
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_GDBM
-#include "php3_gdbm.h"
+#include "php_gdbm.h"
 
 #include <gdbm.h>
 

diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c
index 3c10868aaba21442337b12dbd044b399ea318aab..974794701fb202c7af28e0e9fcccf39dad98c6d1 100644 (file)
--- a/ext/dba/dba_ndbm.c
+++ b/ext/dba/dba_ndbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_NDBM
-#include "php3_ndbm.h"
+#include "php_ndbm.h"
 
 #include <fcntl.h>
 

diff --git a/ext/dba/php3_cdb.h b/ext/dba/php3_cdb.h
deleted file mode 100644 (file)
index 162fa8b..0000000
--- a/ext/dba/php3_cdb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_CDB_H
-#define _PHP3_CDB_H
-
-#if DBA_CDB
-
-#include "php3_dba.h"
-
-DBA_FUNCS(cdb);
-
-#endif
-
-#endif

diff --git a/ext/dba/php3_db2.h b/ext/dba/php3_db2.h
deleted file mode 100644 (file)
index 0f8c458..0000000
--- a/ext/dba/php3_db2.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB2_H
-#define _PHP3_DB2_H
-
-#if DBA_DB2
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db2);
-
-#endif
-
-#endif

diff --git a/ext/dba/php3_db3.h b/ext/dba/php3_db3.h
deleted file mode 100644 (file)
index 4c00dfd..0000000
--- a/ext/dba/php3_db3.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB3_H
-#define _PHP3_DB3_H
-
-#if DBA_DB3
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db3);
-
-#endif
-
-#endif

diff --git a/ext/dba/php3_dbm.h b/ext/dba/php3_dbm.h
deleted file mode 100644 (file)
index 5007c84..0000000
--- a/ext/dba/php3_dbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DBM_H
-#define _PHP3_DBM_H
-
-#if DBA_DBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(dbm);
-
-#endif
-
-#endif

diff --git a/ext/dba/php3_gdbm.h b/ext/dba/php3_gdbm.h
deleted file mode 100644 (file)
index 9a18b53..0000000
--- a/ext/dba/php3_gdbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_GDBM_H
-#define _PHP3_GDBM_H
-
-#if DBA_GDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(gdbm);
-
-#endif
-
-#endif

diff --git a/ext/dba/php3_ndbm.h b/ext/dba/php3_ndbm.h
deleted file mode 100644 (file)
index 398b8e3..0000000
--- a/ext/dba/php3_ndbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_NDBM_H
-#define _PHP3_NDBM_H
-
-#if DBA_NDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(ndbm);
-
-#endif
-
-#endif

diff --git a/ext/dba/php_cdb.h b/ext/dba/php_cdb.h
new file mode 100644 (file)
index 0000000..5574038
--- /dev/null
+++ b/ext/dba/php_cdb.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_CDB_H
+#define _PHP_CDB_H
+
+#if DBA_CDB
+
+#include "php_dba.h"
+
+DBA_FUNCS(cdb);
+
+#endif
+
+#endif

diff --git a/ext/dba/php_db2.h b/ext/dba/php_db2.h
new file mode 100644 (file)
index 0000000..d88582f
--- /dev/null
+++ b/ext/dba/php_db2.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DB2_H
+#define _PHP_DB2_H
+
+#if DBA_DB2
+
+#include "php_dba.h"
+
+DBA_FUNCS(db2);
+
+#endif
+
+#endif

diff --git a/ext/dba/php_db3.h b/ext/dba/php_db3.h
new file mode 100644 (file)
index 0000000..126afe9
--- /dev/null
+++ b/ext/dba/php_db3.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DB3_H
+#define _PHP_DB3_H
+
+#if DBA_DB3
+
+#include "php_dba.h"
+
+DBA_FUNCS(db3);
+
+#endif
+
+#endif

diff --git a/ext/dba/php3_dba.h b/ext/dba/php_dba.h
similarity index 100%
rename from ext/dba/php3_dba.h
rename to ext/dba/php_dba.h

diff --git a/ext/dba/php_dbm.h b/ext/dba/php_dbm.h
new file mode 100644 (file)
index 0000000..e99b8cc
--- /dev/null
+++ b/ext/dba/php_dbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DBM_H
+#define _PHP_DBM_H
+
+#if DBA_DBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(dbm);
+
+#endif
+
+#endif

diff --git a/ext/dba/php_gdbm.h b/ext/dba/php_gdbm.h
new file mode 100644 (file)
index 0000000..0ee6e61
--- /dev/null
+++ b/ext/dba/php_gdbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_GDBM_H
+#define _PHP_GDBM_H
+
+#if DBA_GDBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(gdbm);
+
+#endif
+
+#endif

diff --git a/ext/dba/php_ndbm.h b/ext/dba/php_ndbm.h
new file mode 100644 (file)
index 0000000..798916b
--- /dev/null
+++ b/ext/dba/php_ndbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_NDBM_H
+#define _PHP_NDBM_H
+
+#if DBA_NDBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(ndbm);
+
+#endif
+
+#endif

diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c
index 0cf3f08bf0febbdf0cf357e075790f47d1ba500c..186cf4bbcee7cc219208292f6021b1875396a9aa 100644 (file)
--- a/ext/domxml/domxml.c
+++ b/ext/domxml/domxml.c
@@ -20,7 +20,7 @@
 
 
 #include "php.h"
-#include "php3_domxml.h"
+#include "php_domxml.h"
 
 #if HAVE_DOMXML
 

diff --git a/ext/domxml/php3_domxml.h b/ext/domxml/php_domxml.h
similarity index 98%
rename from ext/domxml/php3_domxml.h
rename to ext/domxml/php_domxml.h
index 8b15ce2cb05e3a232bf131526591bc07c224ed71..70fc1c5c9d02de321a13f0d18a9df9ba7d3210e0 100644 (file)
--- a/ext/domxml/php3_domxml.h
+++ b/ext/domxml/php_domxml.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_DOMXML_H
-#define _PHP3_DOMXML_H
+#ifndef _PHP_DOMXML_H
+#define _PHP_DOMXML_H
 
 #if HAVE_DOMXML
 #include <gnome-xml/parser.h>

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index bd40cb2191e34cdbe1ad699a5c9cc940d90648a1..d327701af8d0895cdc8f1ffad79bf051f6c06a9b 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "reg.h"
 
 unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };

diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index e96ae4858b8a8db079bdbfde84f1e9de80a30434..eef407f86b3f2826b35ffc79a3d6b66a9f298e32 100644 (file)
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -30,7 +30,7 @@
 #include "php.h"
 #include "ext/standard/head.h"
 #include <math.h>
-#include "php3_fdf.h"
+#include "php_fdf.h"
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>

diff --git a/ext/fdf/php3_fdf.h b/ext/fdf/php_fdf.h
similarity index 97%
rename from ext/fdf/php3_fdf.h
rename to ext/fdf/php_fdf.h
index dd8a560839570cde29bdd383b255331f577f3959..ab2256c5fe4530c84c2699174e404fdffb6d9f75 100644 (file)
--- a/ext/fdf/php3_fdf.h
+++ b/ext/fdf/php_fdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP3_FDF_H
-#define _PHP3_FDF_H
+#ifndef _PHP_FDF_H
+#define _PHP_FDF_H
 
 #if HAVE_FDFLIB
 #if WIN32|WINNT
@@ -62,4 +62,4 @@ PHP_FUNCTION(fdf_add_template);
 #else
 #define phpext_fdf_ptr NULL
 #endif
-#endif /* _PHP3_FDF_H */
+#endif /* _PHP_FDF_H */

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index bcf867cd33cfb0d5230c10e0c833ad85d4ff95af..ec3e10eaedefde26301c87b999f5ff0b448a0c38 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -29,7 +29,7 @@
 #include "ext/standard/head.h"
 #include <math.h>
 #include "SAPI.h"
-#include "php3_gd.h"
+#include "php_gd.h"
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>

diff --git a/ext/gd/php3_gd.h b/ext/gd/php_gd.h
similarity index 98%
rename from ext/gd/php3_gd.h
rename to ext/gd/php_gd.h
index 2d97c5300980416506da7e2cb3b9cca49f4eccc5..f5e92e4fbb2b4d261fb4b2305fd9d0b2b876245d 100644 (file)
--- a/ext/gd/php3_gd.h
+++ b/ext/gd/php_gd.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_GD_H
-#define _PHP3_GD_H
+#ifndef _PHP_GD_H
+#define _PHP_GD_H
 
 #define HAVE_GDIMAGECREATEFROMPNG 1
 
@@ -111,4 +111,4 @@ PHPAPI int phpi_get_le_gd(void);
 
 #endif
 
-#endif /* _PHP3_GD_H */
+#endif /* _PHP_GD_H */

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 25679d3fe49863383f7b7a5cdf92f1b26a3e2166..860d26de43ad7e315f6facc22b56f313c20bd02c 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_gettext.h"
+#include "php_gettext.h"
 
 #if HAVE_LIBINTL
 

diff --git a/ext/gettext/php3_gettext.h b/ext/gettext/php_gettext.h
similarity index 100%
rename from ext/gettext/php3_gettext.h
rename to ext/gettext/php_gettext.h

diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index be4f3adbb59277a848bfeda3e79349d7c49c2907..a40b7b45b2747c48f4da3b8e5d6fecdad44f7f80 100644 (file)
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -26,7 +26,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "ext/standard/head.h"
 #include "ext/standard/info.h"
 #include "SAPI.h"
@@ -40,7 +40,7 @@
 #if HYPERWAVE
 
 #include "php_ini.h"
-#include "php3_hyperwave.h"
+#include "php_hyperwave.h"
 
 //hw_module php3_hw_module;
 

diff --git a/ext/hyperwave/php3_hyperwave.h b/ext/hyperwave/php_hyperwave.h
similarity index 100%
rename from ext/hyperwave/php3_hyperwave.h
rename to ext/hyperwave/php_hyperwave.h

diff --git a/ext/icap/php3_icap.c b/ext/icap/php3_icap.c
index 5c63c30a8533b342f204210394bae3ee91f14a51..8279e41f7287d832b6a9c4d3e808abdcc9ee79e0 100644 (file)
--- a/ext/icap/php3_icap.c
+++ b/ext/icap/php3_icap.c
@@ -48,7 +48,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include "cal.h"
-#include "php3_icap.h"
+#include "php_icap.h"
 #include "modules.h"
 #if (WIN32|WINNT)
 #include "winsock.h"

diff --git a/ext/icap/php3_icap.h b/ext/icap/php_icap.h
similarity index 100%
rename from ext/icap/php3_icap.h
rename to ext/icap/php_icap.h

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 1f1260862935c96c1d3fc4a8a5bcf43f80b2d713..5b5470be65367bbc30d8a0870e81c395fb1998c4 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -22,12 +22,12 @@
 
 #include "php.h"
 #include "php_config.h"
-#include "php3_interbase.h"
+#include "php_interbase.h"
 
 #if HAVE_IBASE
 #include <ibase.h>
 #include <time.h>
-#include "php3_string.h"
+#include "php_string.h"
 #include "php_globals.h"
 
 /* {{{ extension definition structures */

diff --git a/ext/interbase/php3_interbase.h b/ext/interbase/php_interbase.h
similarity index 100%
rename from ext/interbase/php3_interbase.h
rename to ext/interbase/php_interbase.h

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index ef2b10858704e2e0cfbb56e1a9f52f90336ac86c..0ca3d18c40dc4a37f227c5a45cbaaae8ffc015f8 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -29,7 +29,7 @@
 
 #include "dl/phpdl.h"
 #include "ext/standard/dl.h"
-#include "php3_ldap.h"
+#include "php_ldap.h"
 
 #if WIN32|WINNT
 #include <string.h>
@@ -44,7 +44,7 @@
 #define __STDC__ 1
 #endif
 
-#include "ext/standard/php3_string.h"
+#include "ext/standard/php_string.h"
 
 
 #if THREAD_SAFE & HAVE_NSLDAP
@@ -109,7 +109,7 @@ DLEXPORT php3_module_entry *get_module(void ) { return &ldap_module_entry; }
 #endif
 
 
-#if 0 /* see my note in php3_ldap.h.  smc */
+#if 0 /* see my note in php_ldap.h.  smc */
 /* Function for setting thread-specific LDAP error values */
 static void php3_ldap_set_ld_error( int err, char *matched, char *errmsg, void *dummy )
 {

diff --git a/ext/ldap/php3_ldap.h b/ext/ldap/php_ldap.h
similarity index 98%
rename from ext/ldap/php3_ldap.h
rename to ext/ldap/php_ldap.h
index 3e8b08f62e27ef65c9622e10cd030d25da041250..a8b1b60867d39b95829747548d5803e0795ae65c 100644 (file)
--- a/ext/ldap/php3_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_LDAP_H
-#define _PHP3_LDAP_H
+#ifndef _PHP_LDAP_H
+#define _PHP_LDAP_H
 
 #if COMPILE_DL
 #undef HAVE_LDAP
@@ -124,4 +124,4 @@ extern ldap_module php3_ldap_module;
 
 #define phpext_ldap_ptr ldap_module_ptr
 
-#endif /* _PHP3_LDAP_H */
+#endif /* _PHP_LDAP_H */

diff --git a/ext/mcal/php3_mcal.c b/ext/mcal/php3_mcal.c
index 0c077904ac439de80c17f34ed3c16cd6072e763a..3d37c174822aa88ec2c7bf17566e930bc441ca89 100644 (file)
--- a/ext/mcal/php3_mcal.c
+++ b/ext/mcal/php3_mcal.c
@@ -54,7 +54,7 @@
 #include "php3_list.h"
 #endif
 #include "mcal.h"
-#include "php3_mcal.h"
+#include "php_mcal.h"
 #include "modules.h"
 #if (WIN32|WINNT)
 #include "winsock.h"

diff --git a/ext/mcal/php3_mcal.h b/ext/mcal/php_mcal.h
similarity index 100%
rename from ext/mcal/php3_mcal.h
rename to ext/mcal/php_mcal.h

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 40014bcd23e28d6070a97f750862d4b3f0a03158..fe0e17352ad57b3dc3f7c8ccd0a3be57e9dd90f6 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -24,7 +24,7 @@
 #include "functions/dl.h"
 #endif
 #include "php_msql.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_MSQL

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 6e42b03fd679f5599ad2a4fdd22cbcb8f757a40f..4da3a3677a63503155d9ce24fba28f50c2b4bbd2 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -25,7 +25,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_mssql.h"
 #include "php_ini.h"
 

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 234f280767678983192f4d8dee1e7fa68c90d816..039cbb8bb50d0f7ca08b2a7e5ffda4cb1a3a4e15 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -26,7 +26,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_mysql.h"
 #include "php_globals.h"
 

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 59df252912ee02c4b5fcc89f8166be9083a6bf47..ec5680401e8cc3b6cb8855cddbbdeb692e443765 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -55,7 +55,7 @@
 
 #if HAVE_OCI8
 
-#include "php3_oci8.h"
+#include "php_oci8.h"
 
 /* True globals, no need for thread safety */
 static int le_conn; /* active connections */

diff --git a/ext/oci8/php3_oci8.h b/ext/oci8/php_oci8.h
similarity index 100%
rename from ext/oci8/php3_oci8.h
rename to ext/oci8/php_oci8.h

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 9158e60fe2fb4add5bda4ed3e0a4fe716450dc07..d17e72da0417b31a3f73d8b507cd7bfbef20e027 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -81,11 +81,13 @@ AC_ARG_WITH(adabas,
     withval=/usr/local
   fi
   if test "$withval" != "no"; then
-    ODBC_INCDIR=$withval/incl
-    ODBC_LIBDIR=$withval/lib
-    ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
-    ODBC_LIBS="${ODBC_LIBDIR}/odbclib.a -lsqlrte -lsqlptc"
+    AC_ADD_INCLUDE($withval/incl)
+    AC_ADD_LIBPATH($withval/lib)
+    ODBC_OBJS="${ODBC_LIBDIR}/odbclib.a"
+    AC_SUBST(ODBC_OBJS)
+    AC_ADD_LIBRARY_WITH_PATH(php_odbc, $abs_builddir/ext/odbc)
+    AC_ADD_LIBRARY(sqlrte)
+    AC_ADD_LIBRARY(sqlptc)
     ODBC_TYPE=adabas
     AC_DEFINE(HAVE_ADABAS)
     AC_MSG_RESULT(yes)
@@ -385,7 +387,7 @@ AC_ARG_WITH(dbmaker,
 ])
 fi
 
-if test -n "$ODBC_TYPE"; then
+if test -n "$ODBC_TYPE" && test -n "$ODBC_INCLUDE"; then
   INCLUDES="$INCLUDES $ODBC_INCLUDE"
   EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS"
   AC_DEFINE(HAVE_UODBC)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index f9a6f9aa9f4b8d9fe43b864763e0c55e8cb8a98d..9a2d412809eef3b3fe676bc58b33a08034577962 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -26,7 +26,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_odbc.h"
 
 #if HAVE_UODBC

diff --git a/ext/odbc/php3_velocis.h b/ext/odbc/php_velocis.h
similarity index 97%
rename from ext/odbc/php3_velocis.h
rename to ext/odbc/php_velocis.h
index e2cdde87af3bf2ccfb278d246131b0b886232686..2b24c5e0559d4856cb4e42e605266507f79945ca 100644 (file)
--- a/ext/odbc/php3_velocis.h
+++ b/ext/odbc/php_velocis.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_VELOCIS_H
-#define _PHP3_VELOCIS_H
+#ifndef _PHP_VELOCIS_H
+#define _PHP_VELOCIS_H
 
 #if COMPILE_DL
 #undef HAVE_VELOCIS
@@ -99,7 +99,7 @@ extern velocis_module php3_velocis_module;
 #define velocis_module_ptr NULL
 
 #endif /* HAVE_VELOCIS */
-#endif /* _PHP3_VELOCIS_H */
+#endif /* _PHP_VELOCIS_H */
 
 /*
  * Local variables:

diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index 1d4bc5072861230d66b8951123ea1f6b7367e04b..80fad7b1a9d4902623dbde608a1daf7089068ca9 100644 (file)
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -41,7 +41,7 @@
 #endif
 
 #ifdef HAVE_VELOCIS
-#include "php3_velocis.h"
+#include "php_velocis.h"
 
 function_entry velocis_functions[] = {
        PHP_FE(velocis_connect,                                                         NULL)

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 807d1d771f1421c302e1b84cd8c94e2fcc9f34c4..33e3715d80475e36700647b5e299dea36dcf8129 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -35,7 +35,7 @@
 
 #if HAVE_ORACLE
 
-#include "php3_oracle.h"
+#include "php_oracle.h"
 #define HASH_DTOR (int (*)(void *))
 
 #ifdef WIN32

diff --git a/ext/oracle/php3_oracle.h b/ext/oracle/php_oracle.h
similarity index 97%
rename from ext/oracle/php3_oracle.h
rename to ext/oracle/php_oracle.h
index 7cf707443505cf5d1bde41a99747de2c1edb2f97..5ca0918380e2799eb6f67cdf0720e503774223c0 100644 (file)
--- a/ext/oracle/php3_oracle.h
+++ b/ext/oracle/php_oracle.h
@@ -2,8 +2,8 @@
 
 /* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */
 
-#ifndef _PHP3_ORACLE_H
-#define _PHP3_ORACLE_H
+#ifndef _PHP_ORACLE_H
+#define _PHP_ORACLE_H
 
 #if HAVE_ORACLE
 
@@ -134,7 +134,7 @@ typedef struct {
 
 #endif /* HAVE_ORACLE */
 
-#endif /* _PHP3_ORACLE_H */
+#endif /* _PHP_ORACLE_H */
 
 /*
  * Local Variables:

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 22bc7638f328c85d888848435ef9b4d4550e736a..1dd70ec31acc4ea99470dca5faf35b74a87ef9fe 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -29,7 +29,7 @@
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 
-#include "ext/standard/php3_string.h"
+#include "ext/standard/php_string.h"
 
 #define PREG_PATTERN_ORDER     0
 #define PREG_SET_ORDER         1

diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 8691c96b9f2ed42f7d93a6c5731eb3b1f9ff1102..fcb951aedd3cf776308f3c427e20c35d474043f9 100644 (file)
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -57,7 +57,7 @@
 
 #if HAVE_PDFLIB
 
-#include "php3_pdf.h"
+#include "php_pdf.h"
 
 #ifdef THREAD_SAFE
 DWORD PDFlibTls;

diff --git a/ext/pdf/php3_pdf.h b/ext/pdf/php_pdf.h
similarity index 98%
rename from ext/pdf/php3_pdf.h
rename to ext/pdf/php_pdf.h
index 6b7c48372d28981b306e2a39b55e1fc2976aa7f8..9ca3c0ae5ea8d0c0e95ad2cf3143c6e848c891c0 100644 (file)
--- a/ext/pdf/php3_pdf.h
+++ b/ext/pdf/php_pdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP3_PDF_H
-#define _PHP3_PDF_H
+#ifndef _PHP_PDF_H
+#define _PHP_PDF_H
 
 #if HAVE_PDFLIB
 
@@ -122,4 +122,4 @@ PHP_FUNCTION(pdf_get_image_height);
 #define pdf_module_ptr NULL
 #endif
 #define phpext_pdf_ptr pdf_module_ptr
-#endif /* _PHP3_PDF_H */
+#endif /* _PHP_PDF_H */

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index cff75b9a0e0fa3a7a7de287196c41825bb59f769..868b1d002f9ae3359b96fba89110b01d40d82695 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -26,8 +26,8 @@
 #endif
 
 #include "php.h"
-#include "php3_pgsql.h"
-#include "ext/standard/php3_standard.h"
+#include "php_pgsql.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_PGSQL
@@ -331,7 +331,7 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                        if (index_ptr->type != le_index_ptr) {
                                RETURN_FALSE;
                        }
-                       link = (int) index_ptr->ptr;
+                       link = (int) (long) index_ptr->ptr;
                        ptr = php3_list_find(link,&type);   /* check if the link is still there */
                        if (ptr && (type==le_link || type==le_plink)) {
                                return_value->value.lval = PGG(default_link) = link;

diff --git a/ext/pgsql/php3_pgsql.h b/ext/pgsql/php_pgsql.h
similarity index 98%
rename from ext/pgsql/php3_pgsql.h
rename to ext/pgsql/php_pgsql.h
index 637fe44e5f55525d9884798a497e8c92be1fe36d..0397ab9a9ec7b7b4278ba7b5fd260a6cdd302db3 100644 (file)
--- a/ext/pgsql/php3_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -29,8 +29,8 @@
  
 /* $Id$ */
 
-#ifndef _PHP3_PGSQL_H
-#define _PHP3_PGSQL_H
+#ifndef _PHP_PGSQL_H
+#define _PHP_PGSQL_H
 
 #if COMPILE_DL
 #undef HAVE_PGSQL
@@ -147,4 +147,4 @@ extern PHP_PGSQL_API php_pgsql_globals pgsql_globals;
 
 #define phpext_pgsql_ptr pgsql_module_ptr
 
-#endif /* _PHP3_PGSQL_H */
+#endif /* _PHP_PGSQL_H */

diff --git a/ext/posix/php3_posix.h b/ext/posix/php_posix.h
similarity index 97%
rename from ext/posix/php3_posix.h
rename to ext/posix/php_posix.h
index 12b7f3fa8f3b4890b29ce647071be550d11e5d2e..7dcc21fc850e302af6920b0c73afa06a10cdea6f 100644 (file)
--- a/ext/posix/php3_posix.h
+++ b/ext/posix/php_posix.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_POSIX_H
-#define _PHP3_POSIX_H
+#ifndef _PHP_POSIX_H
+#define _PHP_POSIX_H
 
 #if COMPILE_DL
 #define HAVE_POSIX 1
@@ -94,4 +94,4 @@ typedef struct {
 
 #define phpext_posix_ptr posix_module_ptr
 
-#endif /* _PHP3_POSIX_H */
+#endif /* _PHP_POSIX_H */

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 65a0304f3ff5749dc242bddf3992526cfea1c403..8a26d0957ad2422a28fd2b69301cead8b0792de0 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -35,11 +35,11 @@
 #include "internal_functions.h"
 #endif
 #if PHP_31 || PHP_API_VERSION >= 19990421
-# include "ext/standard/php3_string.h"
+# include "ext/standard/php_string.h"
 #else
-# include "php3_string.h"
+# include "php_string.h"
 #endif
-#include "php3_posix.h"
+#include "php_posix.h"
 
 #if HAVE_POSIX
 #ifdef HAVE_SYS_TIME_H

diff --git a/ext/session/session.c b/ext/session/session.c
index 0b9491506e641f140ae7b31b339901f9b3a14f76..f8d056759b4be33330dcd2cee7eb4d42070b676f 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -31,7 +31,7 @@
 
 #include "php_session.h"
 #include "ext/standard/md5.h"
-#include "ext/standard/php3_var.h"
+#include "ext/standard/php_var.h"
 #include "ext/standard/datetime.h"
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/url_scanner.h"

diff --git a/ext/snmp/php3_snmp.h b/ext/snmp/php_snmp.h
similarity index 96%
rename from ext/snmp/php3_snmp.h
rename to ext/snmp/php_snmp.h
index 047d3ebf1af5219dd40db1a9964f81b4c5254b0d..46fbc7e9610d5234a9eb6312b6870cdf3e91ee5f 100644 (file)
--- a/ext/snmp/php3_snmp.h
+++ b/ext/snmp/php_snmp.h
@@ -19,8 +19,8 @@
 */
 
 /* $Id$ */
-#ifndef _PHP3_SNMP_H
-#define _PHP3_SNMP_H
+#ifndef _PHP_SNMP_H
+#define _PHP_SNMP_H
 
 #if COMPILE_DL
 #undef HAVE_SNMP
@@ -51,4 +51,4 @@ void php3_info_snmp(ZEND_MODULE_INFO_FUNC_ARGS);
 
 #define phpext_snmp_ptr snmp_module_ptr
 
-#endif  /* _PHP3_SNMP_H */
+#endif  /* _PHP_SNMP_H */

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index ad8133715843af56560ef471adf9be40387d7bbb..5468809c1e37b097d8017e90367111d0e5f266f1 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -23,7 +23,7 @@
 #if defined(COMPILE_DL)
 #include "dl/phpdl.h"
 #endif
-#include "php3_snmp.h"
+#include "php_snmp.h"
 #include <sys/types.h>
 #if MSVC5
 #include <winsock.h>

diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c
index fd6c5932ec24c3d78dc399d089c50c648d814e31..9b176e5126e02811e164b5b1878b7eac5a1d735c 100644 (file)
--- a/ext/snmp/winsnmp.c
+++ b/ext/snmp/winsnmp.c
@@ -7,7 +7,7 @@ Created from the snmputil sample in the Microsoft SDK for NT
 #include "../phpdl.h"
 #include "functions/dl.h"
 #endif
-#include "php3_snmp.h"
+#include "php_snmp.h"
 #include <sys/types.h>
 
 #include <windows.h>

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2d5cce10b6e02bdad6aed8796b1d9e3f076f1e7a..afd9b3497f360cdaeda0adf2048028a340d43bdc 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -21,7 +21,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "internal_functions_registry.h"
-#include "php3_standard.h"
+#include "php_standard.h"
 #include "zend_operators.h"
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 34c8630c4a14ad6bbf01d19e01d8c6d7bae359e2..55dc0f049e1e26f54c87951183db523a32cebf60 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -17,7 +17,7 @@
  */
 
 #include "php.h"
-#include "php3_browscap.h"
+#include "php_browscap.h"
 #include "php_ini.h"
 
 #include "zend_globals.h"

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 35f3e8146624b571023169db333b3e74d1f9edc2..48619c5a67b00a1fb83ae96360716e361c36ab30 100644 (file)
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -46,7 +46,7 @@
 extern char *crypt(char *__key,char *__salt);
 #endif
 
-#include "php3_crypt.h"
+#include "php_crypt.h"
 
 function_entry crypt_functions[] = {
        PHP_FE(crypt,                                                                   NULL)

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 1a1b6d1bdc24826375a703c88f30282dd681ca81..3717f0899b6900d7bf7b36985733130b776fb4ad 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -24,7 +24,7 @@
 #include "php.h"
 #include "fopen-wrappers.h"
 
-#include "php3_dir.h"
+#include "php_dir.h"
 
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 943d436af57059c11feafa8ee2089b30951a9182..b190ea8b98a3cf0876bc8c526d800fbc57be6096 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "php.h"
 #include <ctype.h>
-#include "php3_string.h"
+#include "php_string.h"
 #include "safe_mode.h"
 #include "ext/standard/head.h"
 #include "exec.h"

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 506ef1ecd5840b46ae705df65a072f0554ebccff..60e6eb68fe9213dbf1d0b9d12eb3ba7f889562e0 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -45,7 +45,7 @@
 #endif
 #include "ext/standard/head.h"
 #include "safe_mode.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "file.h"
 #if HAVE_PWD_H
 #if MSVC5

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 61685741a2800eacfefc2af953dfec40c132a214..8a40fed719589f3f398e68d8ca0bc8bd98afbb97 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -69,7 +69,7 @@
 # endif
 #endif
 
-#include "php3_filestat.h"
+#include "php_filestat.h"
 
 #ifndef THREAD_SAFE
 static char *CurrentStatFile=NULL;

diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index a3b6b71ba3f35a2b7bc4d13771c97ccb5344f5ba..ffd53e3acacfaf5d3e861ca460b3ea4809fd00ad 100644 (file)
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -21,7 +21,7 @@
 #include <math.h>                              /* modf() */
 #include "php.h"
 #include "ext/standard/head.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "zend_execute.h"
 #include <stdio.h>
 

diff --git a/ext/standard/head.c b/ext/standard/head.c
index 4e18f363927d804bd809ad92238198a08d1d654b..523e3ff9ac09db247526af09b1bff790115db9b9 100644 (file)
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "SAPI.h"
 #include "main.h"
 #include "head.h"

diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index c5718207bb9cb56e4a15907e55ebad73bf0f9d70..a15ac04020b4e4be29d82b60fdbefa1361d374f5 100644 (file)
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -33,7 +33,7 @@
  */
  
 #include "php.h"
-#include "php3_iptc.h"
+#include "php_iptc.h"
 #include "ext/standard/head.h"
 
 #include <sys/stat.h>

diff --git a/ext/standard/link.c b/ext/standard/link.c
index 9ccf0ecdda382c9808f2d45ec0745b73a3773f11..f296a2dbcb9268ab58ed652b08d2a2c26080b658 100644 (file)
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -19,7 +19,7 @@
 /* $Id$ */
 
 #include "php.h"
-#include "php3_filestat.h"
+#include "php_filestat.h"
 #include "php_globals.h"
 
 #include <stdlib.h>
@@ -46,7 +46,7 @@
 #include <ctype.h>
 
 #include "safe_mode.h"
-#include "php3_link.h"
+#include "php_link.h"
 
 /* {{{ proto string readlink(string filename)
    Return the target of a symbolic link */

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 202a898ec5551946ca3e872f584f3af597d35c0e..db4988a659da5cf2253ab41f0c4346e7521972dd 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -25,7 +25,7 @@
 #ifndef MSVC5
 #include "build-defs.h"
 #endif
-#include "php3_mail.h"
+#include "php_mail.h"
 #include "php_ini.h"
 
 #if APACHE

diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 60e86487135e446705aa57b187b72a1934c80486..af6ad58f5df460e65797e4bf93b4dd440629d630 100644 (file)
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -35,7 +35,7 @@
 #endif
 #include "ext/standard/head.h"
 #include "safe_mode.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "pack.h"
 #if HAVE_PWD_H
 #if MSVC5

diff --git a/ext/standard/php3_browscap.h b/ext/standard/php_browscap.h
similarity index 96%
rename from ext/standard/php3_browscap.h
rename to ext/standard/php_browscap.h
index 2a61016e4770a59b8a78e9396a7a94c445f6f5ba..338272692eed91151c519d6b2133b9db8c7cfff2 100644 (file)
--- a/ext/standard/php3_browscap.h
+++ b/ext/standard/php_browscap.h
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef _PHP3_BROWSCAP_H
-#define _PHP3_BROWSCAP_H
+#ifndef _PHP_BROWSCAP_H
+#define _PHP_BROWSCAP_H
 
 extern php3_module_entry browscap_module_entry;
 #define browscap_module_ptr &browscap_module_entry
@@ -42,4 +42,4 @@ PHP_FUNCTION(get_browser);
 
 #define phpext_browscap_ptr browscap_module_ptr
 
-#endif /* _PHP3_BROWSCAP_H */
+#endif /* _PHP_BROWSCAP_H */

diff --git a/ext/standard/php3_crypt.h b/ext/standard/php_crypt.h
similarity index 85%
rename from ext/standard/php3_crypt.h
rename to ext/standard/php_crypt.h
index 1ae1d5f84be9a9c6094c329a7ad928b58cbe7a61..1b93431cb589d0f00f838fd69ce74b9061b80b86 100644 (file)
--- a/ext/standard/php3_crypt.h
+++ b/ext/standard/php_crypt.h
@@ -1,5 +1,5 @@
-#ifndef PHP3_CRYPT_H
-#define PHP3_CRYPT_H
+#ifndef PHP_CRYPT_H
+#define PHP_CRYPT_H
 
 #if HAVE_CRYPT
 extern php3_module_entry crypt_module_entry;

diff --git a/ext/standard/php3_dir.h b/ext/standard/php_dir.h
similarity index 96%
rename from ext/standard/php3_dir.h
rename to ext/standard/php_dir.h
index 86ccda21c219c34ef8c4c48132e16fc38eb43256..bb09e2fbddb73a68cd91fe1187d836682387b58e 100644 (file)
--- a/ext/standard/php3_dir.h
+++ b/ext/standard/php_dir.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_DIR_H
-#define _PHP3_DIR_H
+#ifndef _PHP_DIR_H
+#define _PHP_DIR_H
 extern php3_module_entry php3_dir_module_entry;
 #define php3_dir_module_ptr &php3_dir_module_entry
 
@@ -36,4 +36,4 @@ PHP_FUNCTION(getdir);
 
 #define phpext_dir_ptr php3_dir_module_ptr
 
-#endif /* _PHP3_DIR_H */
+#endif /* _PHP_DIR_H */

diff --git a/ext/standard/php3_filestat.h b/ext/standard/php_filestat.h
similarity index 100%
rename from ext/standard/php3_filestat.h
rename to ext/standard/php_filestat.h

diff --git a/ext/standard/php3_iptc.h b/ext/standard/php_iptc.h
similarity index 100%
rename from ext/standard/php3_iptc.h
rename to ext/standard/php_iptc.h

diff --git a/ext/standard/php3_link.h b/ext/standard/php_link.h
similarity index 96%
rename from ext/standard/php3_link.h
rename to ext/standard/php_link.h
index 8ffc61e646aa14c5fa703c477e91b0e5a3b773a7..e3c1116f257cb6841057077cf84b22f63873cd85 100644 (file)
--- a/ext/standard/php3_link.h
+++ b/ext/standard/php_link.h
@@ -29,8 +29,8 @@
  */
 
 /* $Id$ */
-#ifndef _PHP3_LINK_H
-#define _PHP3_LINK_H
+#ifndef _PHP_LINK_H
+#define _PHP_LINK_H
 
 PHP_FUNCTION(link);
 PHP_FUNCTION(unlink);
@@ -38,4 +38,4 @@ PHP_FUNCTION(readlink);
 PHP_FUNCTION(linkinfo);
 PHP_FUNCTION(symlink);
 
-#endif /* _PHP3_LINK_H */
+#endif /* _PHP_LINK_H */

diff --git a/ext/standard/php3_mail.h b/ext/standard/php_mail.h
similarity index 100%
rename from ext/standard/php3_mail.h
rename to ext/standard/php_mail.h

diff --git a/ext/standard/php3_standard.h b/ext/standard/php_standard.h
similarity index 91%
rename from ext/standard/php3_standard.h
rename to ext/standard/php_standard.h
index c6a80cde65c3577257d12625c3a18bc7e5e0a84b..8e48c18503e3f8c217023e08e88447573d746f58 100644 (file)
--- a/ext/standard/php3_standard.h
+++ b/ext/standard/php_standard.h
@@ -32,36 +32,36 @@
 
 #include "basic_functions.h"
 #include "phpmath.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "base64.h"
-#include "php3_dir.h"
+#include "php_dir.h"
 #include "dns.h"
 #include "reg.h"
-#include "php3_mail.h"
+#include "php_mail.h"
 #include "md5.h"
 #include "html.h"
 #include "exec.h"
 #include "file.h"
-#include "php3_syslog.h"
-#include "php3_filestat.h"
-#include "php3_browscap.h"
+#include "php_syslog.h"
+#include "php_filestat.h"
+#include "php_browscap.h"
 #include "pack.h"
 #include "datetime.h"
 #include "microtime.h"
 #include "url.h"
 #include "pageinfo.h"
 #include "cyr_convert.h"
-#include "php3_link.h"
+#include "php_link.h"
 #include "fsock.h"
 #include "php_image.h"
-#include "php3_iptc.h"
+#include "php_iptc.h"
 #include "info.h"
 #include "uniqid.h"
-#include "php3_var.h"
+#include "php_var.h"
 #include "quot_print.h"
 #include "type.h"
 #include "dl.h"
-#include "php3_crypt.h"
+#include "php_crypt.h"
 #include "head.h"
 #include "post.h"
 

diff --git a/ext/standard/php3_string.h b/ext/standard/php_string.h
similarity index 100%
rename from ext/standard/php3_string.h
rename to ext/standard/php_string.h

diff --git a/ext/standard/php3_syslog.h b/ext/standard/php_syslog.h
similarity index 100%
rename from ext/standard/php3_syslog.h
rename to ext/standard/php_syslog.h

diff --git a/ext/standard/php3_var.h b/ext/standard/php_var.h
similarity index 100%
rename from ext/standard/php3_var.h
rename to ext/standard/php_var.h

diff --git a/ext/standard/post.c b/ext/standard/post.c
index e74d85b5ac0b706182f2d8dc4d3b44bcf37c74df..c6b1c5297a94625a978addb6761cee343e424131 100644 (file)
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_standard.h"
+#include "php_standard.h"
 #include "php_globals.h"
 #include "SAPI.h"
 

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index bd40cb2191e34cdbe1ad699a5c9cc940d90648a1..d327701af8d0895cdc8f1ffad79bf051f6c06a9b 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "reg.h"
 
 unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };

diff --git a/ext/standard/soundex.c b/ext/standard/soundex.c
index 61defab91b09c2019b33f169ea7ab586ec8f889c..25946e4854413f5a82df370de9994aa5655e2f0e 100644 (file)
--- a/ext/standard/soundex.c
+++ b/ext/standard/soundex.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
-#include "php3_string.h"
+#include "php_string.h"
 
 /* Simple soundex algorithm as described by Knuth in TAOCP, vol 3 */
 /* {{{ proto string soundex(string str)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 80fa1d2a6f2f5e031330f5b25fb8267517594771..e1592343f456beccd13d2624e463d92620c2111f 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -26,7 +26,7 @@
 #include "php.h"
 #include "reg.h"
 #include "post.h"
-#include "php3_string.h"
+#include "php_string.h"
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif

diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 2f29f438eba48e26953e5717733b63b39885875b..2154212ce713a0ee7764bc33c0e4b263bb599da0 100644 (file)
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 
 #include <stdio.h>
-#include "php3_syslog.h"
+#include "php_syslog.h"
 
 static int syslog_started;
 static char *syslog_device;

diff --git a/ext/standard/var.c b/ext/standard/var.c
index ae709201cacf740e6c264379d2784c928d39524f..acd1cc07ed27201db2506df1f4262c921dad1a03 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "php.h"
-#include "php3_string.h"
-#include "php3_var.h"
+#include "php_string.h"
+#include "php_var.h"
 
 /* }}} */
 /* {{{ php_var_dump */

diff --git a/ext/sybase/php3_sybase.h b/ext/sybase/php_sybase.h
similarity index 98%
rename from ext/sybase/php3_sybase.h
rename to ext/sybase/php_sybase.h
index 9c175c8e88100ae13f0859fc6a4f8704e0709916..1ce140d324165e0bba58a088837ec1e45f8ab2cb 100644 (file)
--- a/ext/sybase/php3_sybase.h
+++ b/ext/sybase/php_sybase.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_SYBASE_H
-#define _PHP3_SYBASE_H
+#ifndef _PHP_SYBASE_H
+#define _PHP_SYBASE_H
 
 #if COMPILE_DL
 #undef HAVE_SYBASE
@@ -140,4 +140,4 @@ extern sybase_module php3_sybase_module;
 
 #define phpext_sybase_ptr sybase_module_ptr
 
-#endif /* _PHP3_SYBASE_H */
+#endif /* _PHP_SYBASE_H */

diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index 0ba854679e2f7cd995c0137fb1aec5a3c022ef4b..0bad3988a71eeb2223f7f2f199e3030d66fcfddd 100644 (file)
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -24,8 +24,8 @@
 
 
 #include "php.h"
-#include "php3_sybase.h"
-#include "ext/standard/php3_standard.h"
+#include "php_sybase.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_SYBASE

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 6f98daa86eb08771f7055cb8eeb091fd7edcbd85..201156e06ea237bf7b02b9fad15f27df8f2dafa4 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -22,7 +22,7 @@
 
 #include "php.h"
 #include "php_sybase_ct.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_SYBASE_CT

diff --git a/ext/sysvsem/php3_sysvsem.h b/ext/sysvsem/php_sysvsem.h
similarity index 97%
rename from ext/sysvsem/php3_sysvsem.h
rename to ext/sysvsem/php_sysvsem.h
index 1a12baab80f61fe49f6193b8f5009615199683bd..1d3342ab70157801964e1fdb2f2df765432b7b9b 100644 (file)
--- a/ext/sysvsem/php3_sysvsem.h
+++ b/ext/sysvsem/php_sysvsem.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_SYSVSEM_H
-#define _PHP3_SYSVSEM_H
+#ifndef _PHP_SYSVSEM_H
+#define _PHP_SYSVSEM_H
 
 #if COMPILE_DL
 #undef HAVE_SYSVSEM
@@ -73,4 +73,4 @@ extern sysvsem_module php3_sysvsem_module;
 
 #define phpext_sysvsem_ptr sysvsem_module_ptr
 
-#endif /* _PHP3_SYSVSEM_H */
+#endif /* _PHP_SYSVSEM_H */

diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index b4f69ba5010d9ae6f895a283c68ab62ff534625b..02052242ddffadcf9569483199af781b4b434260 100644 (file)
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -33,7 +33,7 @@
 #include <sys/sem.h>
 #include <errno.h>
 
-#include "php3_sysvsem.h"
+#include "php_sysvsem.h"
 
 #if !HAVE_SEMUN && defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ == 6
 

diff --git a/ext/sysvshm/php3_sysvshm.h b/ext/sysvshm/php_sysvshm.h
similarity index 97%
rename from ext/sysvshm/php3_sysvshm.h
rename to ext/sysvshm/php_sysvshm.h
index bd7538b5773a2f6087678c1625ad2927561a13af..7cbdb34fd2f26e105e291695d276bafdf2f7be57 100644 (file)
--- a/ext/sysvshm/php3_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_SYSVSHM_H
-#define _PHP3_SYSVSHM_H
+#ifndef _PHP_SYSVSHM_H
+#define _PHP_SYSVSHM_H
 
 #if COMPILE_DL
 #undef HAVE_SYSVSHM
@@ -100,4 +100,4 @@ extern sysvshm_module php3_sysvshm_module;
 
 #define phpext_sysvshm_ptr sysvshm_module_ptr
 
-#endif /* _PHP3_SYSVSHM_H */
+#endif /* _PHP_SYSVSHM_H */

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 8d5698eb173eb68ff18c87d4bbd7f64b8a701f56..5b416417e10e4f78317eeb0e39e6cea57abb8b21 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -28,8 +28,8 @@
 
 #include <errno.h>
 
-#include "php3_sysvshm.h"
-#include "../standard/php3_var.h"
+#include "php_sysvshm.h"
+#include "../standard/php_var.h"
 
 function_entry sysvshm_functions[] = {
        PHP_FE(shm_attach, NULL)

diff --git a/ext/xml/php3_xml.h b/ext/xml/php_xml.h
similarity index 100%
rename from ext/xml/php3_xml.h
rename to ext/xml/php_xml.h

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 22ad953804119afd510221c846dfc65d61427224..8886979bc0be055af4a1a9e7190182e6d8ec121c 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -21,9 +21,9 @@
 #define IS_EXT_MODULE
 
 #include "php.h"
-#include "php3_xml.h"
+#include "php_xml.h"
 #include "zend_variables.h"
-#include "ext/standard/php3_string.h"
+#include "ext/standard/php_string.h"
 
 
 #if HAVE_LIBEXPAT

diff --git a/ext/yp/php3_yp.h b/ext/yp/php_yp.h
similarity index 97%
rename from ext/yp/php3_yp.h
rename to ext/yp/php_yp.h
index 1059314293082078b801a1c4451f2f654a69d006..6fab95baebcf83a291f549c99110bf95d5dc9ab1 100644 (file)
--- a/ext/yp/php3_yp.h
+++ b/ext/yp/php_yp.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */ 
 
-#ifndef _PHP3_YP_H
-#define _PHP3_YP_H
+#ifndef _PHP_YP_H
+#define _PHP_YP_H
 
 #if COMPILE_DL
 #undef HAVE_YP
@@ -59,4 +59,4 @@ void php3_info_yp(ZEND_MODULE_INFO_FUNC_ARGS);
 
 #define phpext_yp_ptr yp_module_ptr
 
-#endif /* _PHP3_YP_H */
+#endif /* _PHP_YP_H */

diff --git a/ext/yp/yp.c b/ext/yp/yp.c
index c48fa971dd220d09d68371d3087e51e529a4815d..d7166460c79f3db3cf7ce443684671bdb46f5a5f 100644 (file)
--- a/ext/yp/yp.c
+++ b/ext/yp/yp.c
@@ -21,7 +21,7 @@
 
 #if HAVE_YP
 
-#include "php3_yp.h"
+#include "php_yp.h"
 
 #include <rpcsvc/ypclnt.h>
 

diff --git a/ext/zlib/php3_zlib.h b/ext/zlib/php_zlib.h
similarity index 97%
rename from ext/zlib/php3_zlib.h
rename to ext/zlib/php_zlib.h
index 4b9ece5ff997142ce6594c3f312de0ff48f99a17..6046d1dad8ab115e14f093bdbd6d13b69bd14489 100644 (file)
--- a/ext/zlib/php3_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -25,8 +25,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_ZLIB_H
-#define _PHP3_ZLIB_H
+#ifndef _PHP_ZLIB_H
+#define _PHP_ZLIB_H
 
 #if COMPILE_DL
 #undef HAVE_ZLIB
@@ -76,4 +76,4 @@ PHP_FUNCTION(gzfile);
 
 #define phpext_zlib_ptr zlib_module_ptr
 
-#endif /* _PHP3_ZLIB_H */
+#endif /* _PHP_ZLIB_H */

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 3c7a8e0596e023b369cf185761435b1cd7fa741f..d474958b4e552324631cb157602e92ce0e2b4603 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -38,8 +38,8 @@
 #endif
 #include "ext/standard/head.h"
 #include "safe_mode.h"
-#include "ext/standard/php3_standard.h"
-#include "php3_zlib.h"
+#include "ext/standard/php_standard.h"
+#include "php_zlib.h"
 #include "fopen-wrappers.h"
 #if HAVE_PWD_H
 #if WIN32|WINNT

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index dfa084a0c06700c181d38973a58762c57d39500e..2e0d317446f08cb700f0eb613b74646498867eef 100644 (file)
--- 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 ba08ce6e395d950bd42c538f6c5e8f280cc40219..244303d9d3fe6f6f5d4255e7f4cee0360aff2ed1 100644 (file)
--- 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 24a93f6ff19ca6bd75804634ed9636ab3d946a29..892da7a1ae00dafb98b2659ddd15629f4d552467 100644 (file)
--- 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 47f0f367c8b28fcbfc5a77b26cce088b6a633f3b..031c168596032705b4f983fa7a2b065a462c770b 100644 (file)
--- 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
similarity index 97%
rename from main/php3_compat.h
rename to main/php_compat.h
index f6e60bea7124091967ca1133c7dffa5284c349e9..be0a5fa281f46268cff24cea336e1a4534f7b851 100644 (file)
--- 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/php3_realpath.h b/main/php_realpath.h
similarity index 96%
rename from php3_realpath.h
rename to main/php_realpath.h
index 4dff23e5e14a9c28bc455ce3376abcae699d30c2..92ecdf8574344ceda39ad56b75900176b30615db 100644 (file)
--- a/php3_realpath.h
+++ b/main/php_realpath.h
@@ -16,8 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP3_REALPATH_H_
-#define _PHP3_REALPATH_H_
+#ifndef _PHP_REALPATH_H_
+#define _PHP_REALPATH_H_
 
 extern char *_php3_realpath(const char *path, char resolved_path []);
 

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 9ab9420f6fe743b1b2fb13a5cf9bad9b9143e918..2ddd66d467e71b97e6ceb52cd6839f11b4c53eec 100644 (file)
--- 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"

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 5d693a39829289a1f213d56ca03d320a3b39df4b..3a2a0e2998eba681975fa00896334008e80c272e 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -47,7 +47,7 @@
 #include "zend_highlight.h"
 #include "zend_indent.h"
 
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 
 #include "util_script.h"
 

diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 4ca0ed615cfe56c7f057bb7b36b5b86fe8c68b74..bcd2bcfda8e1845008671136e5e8a2f822fcb5ca 100644 (file)
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -47,7 +47,7 @@
 #include "zend_execute.h"
 #include "zend_highlight.h"
 #include "zend_indent.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "util_script.h"
 #include "php_version.h"
 /*#include "mod_php4.h"*/

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3abfd6f7ad5aaf2311b8a4d8cce662a0a8a392ed..df9e271ebf50a9c121992b3551deaa6360721756 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -52,7 +52,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/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 4ee4ed5d9ce03f36fa1b6e982b4780065b08ad46..9eddc35cf41446bafb95bc97bddde7b7b51b26aa 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -50,8 +50,8 @@
 #include "php_globals.h"
 #include "main.h"
 #include "fopen-wrappers.h"
-#include "ext/standard/php3_standard.h"
-#include "ext/standard/php3_dir.h"
+#include "ext/standard/php_standard.h"
+#include "ext/standard/php_dir.h"
 #include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>