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.

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

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)

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 */

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;

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
 

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

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;

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 */

ext/dba/dba.c

@@ -33,14 +33,14 @@
 
 #if HAVE_DBA
 
-#include "php3_dba.h"
+#include "php_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_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)

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>

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>

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>

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>
 

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>
 

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>
 

ext/dba/php3_cdb.h

@@ -1,12 +0,0 @@
-#ifndef _PHP3_CDB_H
-#define _PHP3_CDB_H
-
-#if DBA_CDB
-
-#include "php3_dba.h"
-
-DBA_FUNCS(cdb);
-
-#endif
-
-#endif

ext/dba/php3_db2.h

@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB2_H
-#define _PHP3_DB2_H
-
-#if DBA_DB2
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db2);
-
-#endif
-
-#endif

ext/dba/php3_db3.h

@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB3_H
-#define _PHP3_DB3_H
-
-#if DBA_DB3
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db3);
-
-#endif
-
-#endif

ext/dba/php3_dbm.h

@@ -1,12 +0,0 @@
-#ifndef _PHP3_DBM_H
-#define _PHP3_DBM_H
-
-#if DBA_DBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(dbm);
-
-#endif
-
-#endif

ext/dba/php3_gdbm.h

@@ -1,12 +0,0 @@
-#ifndef _PHP3_GDBM_H
-#define _PHP3_GDBM_H
-
-#if DBA_GDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(gdbm);
-
-#endif
-
-#endif

ext/dba/php3_ndbm.h

@@ -1,12 +0,0 @@
-#ifndef _PHP3_NDBM_H
-#define _PHP3_NDBM_H
-
-#if DBA_NDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(ndbm);
-
-#endif
-
-#endif

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

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

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

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

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

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

ext/domxml/domxml.c

@@ -20,7 +20,7 @@
 
 
 #include "php.h"
-#include "php3_domxml.h"
+#include "php_domxml.h"
 
 #if HAVE_DOMXML
 

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>

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 };

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>

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 */

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>

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 */

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
 

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;
 

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"

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 */

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 )
 {

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 */

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"

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

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"
 

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"
 

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 */

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)

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

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:

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)

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

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:

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

ext/pdf/pdf.c

@@ -57,7 +57,7 @@
 
 #if HAVE_PDFLIB
 
-#include "php3_pdf.h"
+#include "php_pdf.h"
 
 #ifdef THREAD_SAFE
 DWORD PDFlibTls;

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 */

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;

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 */

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 */

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

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"

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 */

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>

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>

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>

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"

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)

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>

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"

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

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;

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>
 

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"

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>

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 */

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

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

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 */

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;

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 */

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 */

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"
 

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"
 

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 };

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)

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

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;