cvs: /php4 php_realpath.h /php4/dl/mssql php_mssql.h /php4/dl/snmp php_snmp.h /php4/ext/cpdf php_cpdf.h /php4/ext/domxml php_domxml.h /php4/ext/ldap
php_ldap.h /php4/ext/mcal php_mcal.h /php4/ext/oci8 php_oci8.h /php4/ext/odbc php_velocis.h /php4/ext/oracle php_oracle.h /php4/ext/pdf php_pdf.h
/php4/ext/pgsql php_pgsql.h /php4/ext/posix php_posix.h /php4/ext/snmp php_snmp.h /php4/ext/standard php_browscap.h php_crypt.h php_dir.h
php_filestat.h php_iptc.h php_link.h php_mail.h php_standard.h php_string.h php_syslog.h php_var.h /php4/ext/sybase php_sybase.h /php4/ext/sysvsem
php_sysvsem.h /php4/ext/sysvshm php_sysvshm.h /php4/ext/xml php_xml.h /php4/ext/yp php_yp.h /php4/ext/zlib php_zlib.h /php4 php3_compat.h
php3_realpath.h /php4/dl/mssql php3_mssql.h /php4/dl/snmp php3_snmp.h /php4/ext/cpdf php3_cpdf.h /php4/ext/domxml php3_domxml.h /php4/ext/ldap
php3_ldap.h /php4/ext/mcal php3_mcal.h /php4/ext/oci8 php3_oci8.h /php4/ext/odbc php3_velocis.h /php4/ext/oracle php3_oracle.h /php4/ext/pdf
php3_pdf.h /php4/ext/pgsql php3_pgsql.h /php4/ext/posix php3_posix.h /php4/ext/snmp php3_snmp.h /php4/ext/standard php3_browscap.h php3_crypt.h
php3_dir.h php3_filestat.h php3_iptc.h php3_link.h php3_mail.h php3_standard.h php3_string.h php3_syslog.h php3_var.h /php4/ext/sybase php3_sybase.h
/php4/ext/sysvsem php3_sysvsem.h /php4/ext/sysvshm php3_sysvshm.h /php4/ext/xml php3_xml.h /php4/ext/yp php3_yp.h /php4/ext/zlib php3_zlib.h /php4
php_compat.h fopen-wrappers.c internal_functions_win32.c main.c php.h rfc1867.c /php4/dl/mssql mssql.c /php4/dl/snmp snmp.c winsnmp.c /php4/ext/aspell
aspell.c /php4/ext/bcmath bcmath.c /php4/ext/cpdf cpdf.c /php4/ext/dav dav.c /php4/ext/db db.c /php4/ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c
dba_dbm.c dba_gdbm.c dba_ndbm.c /php4/ext/domxml domxml.c /php4/ext/fdf fdf.c /php4/ext/gd gd.c /php4/ext/gettext gettext.c /php4/ext/hyperwave hw.c
/php4/ext/icap php3_icap.c /php4/ext/interbase interbase.c /php4/ext/ldap ldap.c /php4/ext/mcal php3_mcal.c /php4/ext/msql php_msql.c /php4/ext/mssql
php_mssql.c /php4/ext/mysql php_mysql.c /php4/ext/oci8 oci8.c /php4/ext/odbc config.m4 php_odbc.c velocis.c /php4/ext/oracle oracle.c /php4/ext/pcre
php_pcre.c /php4/ext/pdf pdf.c /php4/ext/pgsql pgsql.c /php4/ext/posix posix.c /php4/ext/session session.c /php4/ext/snmp snmp.c /php4/ext/standard
basic_functions.c browscap.c crypt.c dir.c exec.c file.c filestat.c formatted_print.c head.c iptc.c link.c mail.c pack.c post.c reg.c soundex.c
string.c syslog.c var.c /php4/ext/sybase sybase.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c
/php4/ext/xml xml.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c /php4/sapi/apache mod_php4.c sapi_apache.c /php4/sapi/cgi cgi_main.c /php4/sapi/servlet
servlet.c

sas Sat Dec 4 14:16:15 1999 EDT Added files: /php4 php_realpath.h /php4/dl/mssql php_mssql.h /php4/dl/snmp php_snmp.h /php4/ext/cpdf php_cpdf.h /php4/ext/domxml php_domxml.h /php4/ext/ldap php_ldap.h /php4/ext/mcal php_mcal.h /php4/ext/oci8 php_oci8.h /php4/ext/odbc php_velocis.h /php4/ext/oracle php_oracle.h /php4/ext/pdf php_pdf.h /php4/ext/pgsql php_pgsql.h /php4/ext/posix php_posix.h /php4/ext/snmp php_snmp.h /php4/ext/standard php_browscap.h php_crypt.h php_dir.h php_filestat.h php_iptc.h php_link.h php_mail.h php_standard.h php_string.h php_syslog.h php_var.h /php4/ext/sybase php_sybase.h /php4/ext/sysvsem php_sysvsem.h /php4/ext/sysvshm php_sysvshm.h /php4/ext/xml php_xml.h /php4/ext/yp php_yp.h /php4/ext/zlib php_zlib.h Removed files: /php4 php3_compat.h php3_realpath.h /php4/dl/mssql php3_mssql.h /php4/dl/snmp php3_snmp.h /php4/ext/cpdf php3_cpdf.h /php4/ext/domxml php3_domxml.h /php4/ext/ldap php3_ldap.h /php4/ext/mcal php3_mcal.h /php4/ext/oci8 php3_oci8.h /php4/ext/odbc php3_velocis.h /php4/ext/oracle php3_oracle.h /php4/ext/pdf php3_pdf.h /php4/ext/pgsql php3_pgsql.h /php4/ext/posix php3_posix.h /php4/ext/snmp php3_snmp.h /php4/ext/standard php3_browscap.h php3_crypt.h php3_dir.h php3_filestat.h php3_iptc.h php3_link.h php3_mail.h php3_standard.h php3_string.h php3_syslog.h php3_var.h /php4/ext/sybase php3_sybase.h /php4/ext/sysvsem php3_sysvsem.h /php4/ext/sysvshm php3_sysvshm.h /php4/ext/xml php3_xml.h /php4/ext/yp php3_yp.h /php4/ext/zlib php3_zlib.h Modified files: /php4 php_compat.h fopen-wrappers.c internal_functions_win32.c main.c php.h rfc1867.c /php4/dl/mssql mssql.c /php4/dl/snmp snmp.c winsnmp.c /php4/ext/aspell aspell.c /php4/ext/bcmath bcmath.c /php4/ext/cpdf cpdf.c /php4/ext/dav dav.c /php4/ext/db db.c /php4/ext/dba dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c dba_gdbm.c dba_ndbm.c /php4/ext/domxml domxml.c /php4/ext/fdf fdf.c /php4/ext/gd gd.c /php4/ext/gettext gettext.c /php4/ext/hyperwave hw.c /php4/ext/icap php3_icap.c /php4/ext/interbase interbase.c /php4/ext/ldap ldap.c /php4/ext/mcal php3_mcal.c /php4/ext/msql php_msql.c /php4/ext/mssql php_mssql.c /php4/ext/mysql php_mysql.c /php4/ext/oci8 oci8.c /php4/ext/odbc config.m4 php_odbc.c velocis.c /php4/ext/oracle oracle.c /php4/ext/pcre php_pcre.c /php4/ext/pdf pdf.c /php4/ext/pgsql pgsql.c /php4/ext/posix posix.c /php4/ext/session session.c /php4/ext/snmp snmp.c /php4/ext/standard basic_functions.c browscap.c crypt.c dir.c exec.c file.c filestat.c formatted_print.c head.c iptc.c link.c mail.c pack.c post.c reg.c soundex.c string.c syslog.c var.c /php4/ext/sybase sybase.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/sysvsem sysvsem.c /php4/ext/sysvshm sysvshm.c /php4/ext/xml xml.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c /php4/sapi/apache mod_php4.c sapi_apache.c /php4/sapi/cgi cgi_main.c /php4/sapi/servlet servlet.c Log: 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. Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.31 php4/fopen-wrappers.c:1.32 --- php4/fopen-wrappers.c:1.31 Tue Nov 30 15:18:06 1999 +++ php4/fopen-wrappers.c Sat Dec 4 14:15:41 1999 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.31 1999/11/30 20:18:06 andi Exp $ */ +/* $Id: fopen-wrappers.c,v 1.32 1999/12/04 19:15:41 sas Exp $ */ /* Synced with php3 revision 1.66 1999-06-18 [ssb] */ @@ -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 Index: php4/internal_functions_win32.c diff -u php4/internal_functions_win32.c:1.17 php4/internal_functions_win32.c:1.18 --- php4/internal_functions_win32.c:1.17 Fri Nov 19 11:42:19 1999 +++ php4/internal_functions_win32.c Sat Dec 4 14:15:41 1999 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.17 1999/11/19 16:42:19 andi Exp $ */ +/* $Id: internal_functions_win32.c,v 1.18 1999/12/04 19:15:41 sas Exp $ */ #include "php.h" @@ -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 }; Index: php4/main.c diff -u php4/main.c:1.149 php4/main.c:1.150 --- php4/main.c:1.149 Sat Dec 4 13:06:15 1999 +++ php4/main.c Sat Dec 4 14:15:41 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.149 1999/12/04 18:06:15 sas Exp $ */ +/* $Id: main.c,v 1.150 1999/12/04 19:15:41 sas Exp $ */ #include <stdio.h> @@ -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> Index: php4/php.h diff -u php4/php.h:1.47 php4/php.h:1.48 --- php4/php.h:1.47 Fri Nov 26 19:48:50 1999 +++ php4/php.h Sat Dec 4 14:15:41 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.47 1999/11/27 00:48:50 zeev Exp $ */ +/* $Id: php.h,v 1.48 1999/12/04 19:15:41 sas Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -148,7 +148,7 @@ #include "zend_hash.h" -#include "php3_compat.h" +#include "php_compat.h" #include "zend_alloc.h" #include "zend_stack.h" Index: php4/rfc1867.c diff -u php4/rfc1867.c:1.13 php4/rfc1867.c:1.14 --- php4/rfc1867.c:1.13 Fri Oct 15 11:22:20 1999 +++ php4/rfc1867.c Sat Dec 4 14:15:41 1999 @@ -15,11 +15,11 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.13 1999/10/15 15:22:20 thies Exp $ */ +/* $Id: rfc1867.c,v 1.14 1999/12/04 19:15:41 sas Exp $ */ #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" Index: php4/dl/mssql/mssql.c diff -u php4/dl/mssql/mssql.c:1.7 php4/dl/mssql/mssql.c:1.8 --- php4/dl/mssql/mssql.c:1.7 Sat Sep 4 09:18:54 1999 +++ php4/dl/mssql/mssql.c Sat Dec 4 14:15:42 1999 @@ -35,15 +35,15 @@ #define IS_EXT_MODULE #include "php.h" -#include "php3_mssql.h" +#include "php_mssql.h" #if HAVE_MSSQL #define SAFE_STRING(s) ((s)?(s):"") #if PHP_31 -#include "ext/standard/php3_string.h" +#include "ext/standard/php_string.h" #else -#include "functions/php3_string.h" +#include "functions/php_string.h" #endif #if BROKEN_MSSQL_PCONNECTS Index: php4/dl/snmp/snmp.c diff -u php4/dl/snmp/snmp.c:1.2 php4/dl/snmp/snmp.c:1.3 --- php4/dl/snmp/snmp.c:1.2 Mon Aug 2 15:16:38 1999 +++ php4/dl/snmp/snmp.c Sat Dec 4 14:15:42 1999 @@ -26,7 +26,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.2 1999/08/02 19:16:38 zeev Exp $ */ +/* $Id: snmp.c,v 1.3 1999/12/04 19:15:42 sas Exp $ */ #ifndef __P #define __P(p) p @@ -37,7 +37,7 @@ #include "phpdl.h" #include "functions/dl.h" #endif -#include "php3_snmp.h" +#include "php_snmp.h" #include <sys/types.h> #if MSVC5 #include <winsock.h> Index: php4/dl/snmp/winsnmp.c diff -u php4/dl/snmp/winsnmp.c:1.2 php4/dl/snmp/winsnmp.c:1.3 --- php4/dl/snmp/winsnmp.c:1.2 Mon Aug 2 15:16:38 1999 +++ php4/dl/snmp/winsnmp.c Sat Dec 4 14:15:42 1999 @@ -7,7 +7,7 @@ #include "../phpdl.h" #include "functions/dl.h" #endif -#include "php3_snmp.h" +#include "php_snmp.h" #include <sys/types.h> #include <windows.h> Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.6 php4/ext/aspell/aspell.c:1.7 --- php4/ext/aspell/aspell.c:1.6 Tue Nov 23 01:46:40 1999 +++ php4/ext/aspell/aspell.c Sat Dec 4 14:15:43 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.6 1999/11/23 06:46:40 evan Exp $ */ +/* $Id: aspell.c,v 1.7 1999/12/04 19:15:43 sas Exp $ */ #include "php.h" #if defined(COMPILE_DL) @@ -28,7 +28,7 @@ #if HAVE_ASPELL -#include "php3_aspell.h" +#include "php_aspell.h" #if APACHE # ifndef DEBUG # undef palloc Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.7 php4/ext/bcmath/bcmath.c:1.8 --- php4/ext/bcmath/bcmath.c:1.7 Mon Aug 2 15:16:39 1999 +++ php4/ext/bcmath/bcmath.c Sat Dec 4 14:15:43 1999 @@ -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) Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.2 php4/ext/cpdf/cpdf.c:1.3 --- php4/ext/cpdf/cpdf.c:1.2 Thu Nov 25 02:00:27 1999 +++ php4/ext/cpdf/cpdf.c Sat Dec 4 14:15:44 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.2 1999/11/25 07:00:27 steinm Exp $ */ +/* $Id: cpdf.c,v 1.3 1999/12/04 19:15:44 sas Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -54,7 +54,7 @@ #endif #if HAVE_CPDFLIB -#include "php3_cpdf.h" +#include "php_cpdf.h" #ifdef THREAD_SAFE DWORD CPDFlibTls; Index: php4/ext/dav/dav.c diff -u php4/ext/dav/dav.c:1.3 php4/ext/dav/dav.c:1.4 --- php4/ext/dav/dav.c:1.3 Fri Jul 16 09:12:44 1999 +++ php4/ext/dav/dav.c Sat Dec 4 14:15:45 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dav.c,v 1.3 1999/07/16 13:12:44 zeev Exp $ */ +/* $Id: dav.c,v 1.4 1999/12/04 19:15:45 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL @@ -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 Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.12 php4/ext/db/db.c:1.13 --- php4/ext/db/db.c:1.12 Sun Nov 14 18:03:45 1999 +++ php4/ext/db/db.c Sat Dec 4 14:15:46 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.12 1999/11/14 23:03:45 sas Exp $ */ +/* $Id: db.c,v 1.13 1999/12/04 19:15:46 sas Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -148,8 +148,8 @@ #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; Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.6 php4/ext/dba/dba.c:1.7 --- php4/ext/dba/dba.c:1.6 Sat Nov 20 17:50:42 1999 +++ php4/ext/dba/dba.c Sat Dec 4 14:15:46 1999 @@ -27,20 +27,20 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.6 1999/11/20 22:50:42 sas Exp $ */ +/* $Id: dba.c,v 1.7 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #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) @@ -204,7 +204,7 @@ { dba_handler *hptr; - PUTS("V1 ($Id: dba.c,v 1.6 1999/11/20 22:50:42 sas Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.7 1999/12/04 19:15:46 sas Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); Index: php4/ext/dba/dba_cdb.c diff -u php4/ext/dba/dba_cdb.c:1.1 php4/ext/dba/dba_cdb.c:1.2 --- php4/ext/dba/dba_cdb.c:1.1 Wed Jul 21 11:12:31 1999 +++ php4/ext/dba/dba_cdb.c Sat Dec 4 14:15:46 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_cdb.c,v 1.1 1999/07/21 15:12:31 sas Exp $ */ +/* $Id: dba_cdb.c,v 1.2 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #if DBA_CDB -#include "php3_cdb.h" +#include "php_cdb.h" #include <sys/types.h> #include <unistd.h> Index: php4/ext/dba/dba_db2.c diff -u php4/ext/dba/dba_db2.c:1.3 php4/ext/dba/dba_db2.c:1.4 --- php4/ext/dba/dba_db2.c:1.3 Fri Sep 17 05:56:30 1999 +++ php4/ext/dba/dba_db2.c Sat Dec 4 14:15:46 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db2.c,v 1.3 1999/09/17 09:56:30 sas Exp $ */ +/* $Id: dba_db2.c,v 1.4 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #if DBA_DB2 -#include "php3_db2.h" +#include "php_db2.h" #include <sys/stat.h> #include <string.h> Index: php4/ext/dba/dba_db3.c diff -u php4/ext/dba/dba_db3.c:1.1 php4/ext/dba/dba_db3.c:1.2 --- php4/ext/dba/dba_db3.c:1.1 Sat Nov 20 17:50:42 1999 +++ php4/ext/dba/dba_db3.c Sat Dec 4 14:15:46 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_db3.c,v 1.1 1999/11/20 22:50:42 sas Exp $ */ +/* $Id: dba_db3.c,v 1.2 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #if DBA_DB3 -#include "php3_db3.h" +#include "php_db3.h" #include <sys/stat.h> #include <string.h> Index: php4/ext/dba/dba_dbm.c diff -u php4/ext/dba/dba_dbm.c:1.2 php4/ext/dba/dba_dbm.c:1.3 --- php4/ext/dba/dba_dbm.c:1.2 Fri Sep 17 05:56:30 1999 +++ php4/ext/dba/dba_dbm.c Sat Dec 4 14:15:46 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_dbm.c,v 1.2 1999/09/17 09:56:30 sas Exp $ */ +/* $Id: dba_dbm.c,v 1.3 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #if DBA_DBM -#include "php3_dbm.h" +#include "php_dbm.h" #include <dbm.h> Index: php4/ext/dba/dba_gdbm.c diff -u php4/ext/dba/dba_gdbm.c:1.2 php4/ext/dba/dba_gdbm.c:1.3 --- php4/ext/dba/dba_gdbm.c:1.2 Fri Sep 17 05:56:30 1999 +++ php4/ext/dba/dba_gdbm.c Sat Dec 4 14:15:46 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_gdbm.c,v 1.2 1999/09/17 09:56:30 sas Exp $ */ +/* $Id: dba_gdbm.c,v 1.3 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #if DBA_GDBM -#include "php3_gdbm.h" +#include "php_gdbm.h" #include <gdbm.h> Index: php4/ext/dba/dba_ndbm.c diff -u php4/ext/dba/dba_ndbm.c:1.2 php4/ext/dba/dba_ndbm.c:1.3 --- php4/ext/dba/dba_ndbm.c:1.2 Fri Sep 17 05:56:30 1999 +++ php4/ext/dba/dba_ndbm.c Sat Dec 4 14:15:46 1999 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba_ndbm.c,v 1.2 1999/09/17 09:56:30 sas Exp $ */ +/* $Id: dba_ndbm.c,v 1.3 1999/12/04 19:15:46 sas Exp $ */ #include "php.h" #if DBA_NDBM -#include "php3_ndbm.h" +#include "php_ndbm.h" #include <fcntl.h> Index: php4/ext/domxml/domxml.c diff -u php4/ext/domxml/domxml.c:1.2 php4/ext/domxml/domxml.c:1.3 --- php4/ext/domxml/domxml.c:1.2 Wed Nov 24 07:10:15 1999 +++ php4/ext/domxml/domxml.c Sat Dec 4 14:15:47 1999 @@ -16,11 +16,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: domxml.c,v 1.2 1999/11/24 12:10:15 eschmid Exp $ */ +/* $Id: domxml.c,v 1.3 1999/12/04 19:15:47 sas Exp $ */ #include "php.h" -#include "php3_domxml.h" +#include "php_domxml.h" #if HAVE_DOMXML Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.9 php4/ext/fdf/fdf.c:1.10 --- php4/ext/fdf/fdf.c:1.9 Wed Oct 6 01:23:28 1999 +++ php4/ext/fdf/fdf.c Sat Dec 4 14:15:47 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.9 1999/10/06 05:23:28 steinm Exp $ */ +/* $Id: fdf.c,v 1.10 1999/12/04 19:15:47 sas Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -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> Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.26 php4/ext/gd/gd.c:1.27 --- php4/ext/gd/gd.c:1.26 Sat Dec 4 09:45:37 1999 +++ php4/ext/gd/gd.c Sat Dec 4 14:15:48 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.26 1999/12/04 14:45:37 ssb Exp $ */ +/* $Id: gd.c,v 1.27 1999/12/04 19:15:48 sas Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -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> Index: php4/ext/gettext/gettext.c diff -u php4/ext/gettext/gettext.c:1.8 php4/ext/gettext/gettext.c:1.9 --- php4/ext/gettext/gettext.c:1.8 Fri Sep 24 15:15:17 1999 +++ php4/ext/gettext/gettext.c Sat Dec 4 14:15:49 1999 @@ -16,11 +16,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: gettext.c,v 1.8 1999/09/24 19:15:17 sas Exp $ */ +/* $Id: gettext.c,v 1.9 1999/12/04 19:15:49 sas Exp $ */ #include <stdio.h> #include "php.h" -#include "php3_gettext.h" +#include "php_gettext.h" #if HAVE_LIBINTL Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.25 php4/ext/hyperwave/hw.c:1.26 --- php4/ext/hyperwave/hw.c:1.25 Fri Nov 26 11:51:54 1999 +++ php4/ext/hyperwave/hw.c Sat Dec 4 14:15:49 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.25 1999/11/26 16:51:54 sas Exp $ */ +/* $Id: hw.c,v 1.26 1999/12/04 19:15:49 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -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; Index: php4/ext/icap/php3_icap.c diff -u php4/ext/icap/php3_icap.c:1.12 php4/ext/icap/php3_icap.c:1.13 --- php4/ext/icap/php3_icap.c:1.12 Fri Aug 27 00:21:47 1999 +++ php4/ext/icap/php3_icap.c Sat Dec 4 14:15:50 1999 @@ -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" Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.8 php4/ext/interbase/interbase.c:1.9 --- php4/ext/interbase/interbase.c:1.8 Sat Sep 4 09:18:54 1999 +++ php4/ext/interbase/interbase.c Sat Dec 4 14:15:51 1999 @@ -16,18 +16,18 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.8 1999/09/04 13:18:54 zeev Exp $ */ +/* $Id: interbase.c,v 1.9 1999/12/04 19:15:51 sas Exp $ */ /* TODO: A lot... */ #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 */ Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.15 php4/ext/ldap/ldap.c:1.16 --- php4/ext/ldap/ldap.c:1.15 Sun Nov 21 21:31:32 1999 +++ php4/ext/ldap/ldap.c Sat Dec 4 14:15:53 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.15 1999/11/22 02:31:32 evan Exp $ */ +/* $Id: ldap.c,v 1.16 1999/12/04 19:15:53 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -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 @@ #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 ) { @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.15 1999/11/22 02:31:32 evan Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.16 1999/12/04 19:15:53 sas Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" Index: php4/ext/mcal/php3_mcal.c diff -u php4/ext/mcal/php3_mcal.c:1.7 php4/ext/mcal/php3_mcal.c:1.8 --- php4/ext/mcal/php3_mcal.c:1.7 Thu Sep 23 10:34:00 1999 +++ php4/ext/mcal/php3_mcal.c Sat Dec 4 14:15:54 1999 @@ -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" Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.5 php4/ext/msql/php_msql.c:1.6 --- php4/ext/msql/php_msql.c:1.5 Tue Oct 12 10:53:05 1999 +++ php4/ext/msql/php_msql.c Sat Dec 4 14:15:55 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.5 1999/10/12 14:53:05 thies Exp $ */ +/* $Id: php_msql.c,v 1.6 1999/12/04 19:15:55 sas Exp $ */ #include "php.h" #if COMPILE_DL @@ -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 Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.2 php4/ext/mssql/php_mssql.c:1.3 --- php4/ext/mssql/php_mssql.c:1.2 Wed Nov 10 14:58:07 1999 +++ php4/ext/mssql/php_mssql.c Sat Dec 4 14:15:55 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.2 1999/11/10 19:58:07 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.3 1999/12/04 19:15:55 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -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" Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.11 php4/ext/mysql/php_mysql.c:1.12 --- php4/ext/mysql/php_mysql.c:1.11 Sat Dec 4 09:45:38 1999 +++ php4/ext/mysql/php_mysql.c Sat Dec 4 14:15:56 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.11 1999/12/04 14:45:38 ssb Exp $ */ +/* $Id: php_mysql.c,v 1.12 1999/12/04 19:15:56 sas Exp $ */ /* TODO: @@ -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" Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.40 php4/ext/oci8/oci8.c:1.41 --- php4/ext/oci8/oci8.c:1.40 Sat Dec 4 07:06:32 1999 +++ php4/ext/oci8/oci8.c Sat Dec 4 14:15:56 1999 @@ -22,7 +22,7 @@ #define OCI_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.40 1999/12/04 12:06:32 thies Exp $ */ +/* $Id: oci8.c,v 1.41 1999/12/04 19:15:56 sas Exp $ */ /* TODO list: * @@ -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 */ Index: php4/ext/odbc/config.m4 diff -u php4/ext/odbc/config.m4:1.10 php4/ext/odbc/config.m4:1.11 --- php4/ext/odbc/config.m4:1.10 Sun Nov 28 19:45:28 1999 +++ php4/ext/odbc/config.m4 Sat Dec 4 14:15:57 1999 @@ -81,11 +81,13 @@ 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 @@ ]) 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) Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.13 php4/ext/odbc/php_odbc.c:1.14 --- php4/ext/odbc/php_odbc.c:1.13 Tue Nov 30 07:41:36 1999 +++ php4/ext/odbc/php_odbc.c Sat Dec 4 14:15:57 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.13 1999/11/30 12:41:36 lurcher Exp $ */ +/* $Id: php_odbc.c,v 1.14 1999/12/04 19:15:57 sas Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -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 Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.8 php4/ext/odbc/velocis.c:1.9 --- php4/ext/odbc/velocis.c:1.8 Tue Nov 9 09:28:59 1999 +++ php4/ext/odbc/velocis.c Sat Dec 4 14:15:57 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.8 1999/11/09 14:28:59 ssb Exp $ */ +/* $Id: velocis.c,v 1.9 1999/12/04 19:15:57 sas Exp $ */ /* * TODO: @@ -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) Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.27 php4/ext/oracle/oracle.c:1.28 --- php4/ext/oracle/oracle.c:1.27 Tue Oct 12 10:53:11 1999 +++ php4/ext/oracle/oracle.c Sat Dec 4 14:15:58 1999 @@ -35,7 +35,7 @@ #if HAVE_ORACLE -#include "php3_oracle.h" +#include "php_oracle.h" #define HASH_DTOR (int (*)(void *)) #ifdef WIN32 Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.28 php4/ext/pcre/php_pcre.c:1.29 --- php4/ext/pcre/php_pcre.c:1.28 Fri Nov 19 17:59:12 1999 +++ php4/ext/pcre/php_pcre.c Sat Dec 4 14:15:59 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.28 1999/11/19 22:59:12 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.29 1999/12/04 19:15:59 sas Exp $ */ /* TODO: @@ -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 Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.16 php4/ext/pdf/pdf.c:1.17 --- php4/ext/pdf/pdf.c:1.16 Fri Oct 15 11:22:21 1999 +++ php4/ext/pdf/pdf.c Sat Dec 4 14:16:00 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.16 1999/10/15 15:22:21 thies Exp $ */ +/* $Id: pdf.c,v 1.17 1999/12/04 19:16:00 sas Exp $ */ /* pdflib 2.01 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -57,7 +57,7 @@ #if HAVE_PDFLIB -#include "php3_pdf.h" +#include "php_pdf.h" #ifdef THREAD_SAFE DWORD PDFlibTls; Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.27 php4/ext/pgsql/pgsql.c:1.28 --- php4/ext/pgsql/pgsql.c:1.27 Fri Nov 19 20:14:36 1999 +++ php4/ext/pgsql/pgsql.c Sat Dec 4 14:16:00 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.27 1999/11/20 01:14:36 andi Exp $ */ +/* $Id: pgsql.c,v 1.28 1999/12/04 19:16:00 sas Exp $ */ #include <stdlib.h> @@ -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 @@ 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; Index: php4/ext/posix/posix.c diff -u php4/ext/posix/posix.c:1.1 php4/ext/posix/posix.c:1.2 --- php4/ext/posix/posix.c:1.1 Fri Dec 3 08:13:48 1999 +++ php4/ext/posix/posix.c Sat Dec 4 14:16:01 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.1 1999/12/03 13:13:48 sas Exp $ */ +/* $Id: posix.c,v 1.2 1999/12/04 19:16:01 sas Exp $ */ #include "php.h" @@ -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 @@ -138,7 +138,7 @@ static PHP_MINFO_FUNCTION(posix) { - PUTS("$Revision: 1.1 $\n"); + PUTS("$Revision: 1.2 $\n"); } /* {{{ proto int posix_kill(int pid, int sig) Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.73 php4/ext/session/session.c:1.74 --- php4/ext/session/session.c:1.73 Sat Dec 4 13:56:17 1999 +++ php4/ext/session/session.c Sat Dec 4 14:16:02 1999 @@ -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" Index: php4/ext/snmp/snmp.c diff -u php4/ext/snmp/snmp.c:1.11 php4/ext/snmp/snmp.c:1.12 --- php4/ext/snmp/snmp.c:1.11 Mon Nov 8 05:33:06 1999 +++ php4/ext/snmp/snmp.c Sat Dec 4 14:16:02 1999 @@ -17,13 +17,13 @@ | Steven Lawrance <slawrance@technologist.com> | +----------------------------------------------------------------------+ */ -/* $Id: snmp.c,v 1.11 1999/11/08 10:33:06 sas Exp $ */ +/* $Id: snmp.c,v 1.12 1999/12/04 19:16:02 sas Exp $ */ #include "php.h" #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> Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.130 php4/ext/standard/basic_functions.c:1.131 --- php4/ext/standard/basic_functions.c:1.130 Wed Dec 1 12:21:52 1999 +++ php4/ext/standard/basic_functions.c Sat Dec 4 14:16:03 1999 @@ -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> Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.14 php4/ext/standard/browscap.c:1.15 --- php4/ext/standard/browscap.c:1.14 Sat Oct 30 10:22:09 1999 +++ php4/ext/standard/browscap.c Sat Dec 4 14:16:03 1999 @@ -17,7 +17,7 @@ */ #include "php.h" -#include "php3_browscap.h" +#include "php_browscap.h" #include "php_ini.h" #include "zend_globals.h" Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.10 php4/ext/standard/crypt.c:1.11 --- php4/ext/standard/crypt.c:1.10 Fri Sep 24 15:35:25 1999 +++ php4/ext/standard/crypt.c Sat Dec 4 14:16:03 1999 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.10 1999/09/24 19:35:25 sas Exp $ */ +/* $Id: crypt.c,v 1.11 1999/12/04 19:16:03 sas Exp $ */ #include <stdlib.h> #include "php.h" @@ -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) Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.16 php4/ext/standard/dir.c:1.17 --- php4/ext/standard/dir.c:1.16 Wed Oct 20 14:09:44 1999 +++ php4/ext/standard/dir.c Sat Dec 4 14:16:03 1999 @@ -17,14 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.16 1999/10/20 18:09:44 andi Exp $ */ +/* $Id: dir.c,v 1.17 1999/12/04 19:16:03 sas Exp $ */ /* {{{ includes/startup/misc */ #include "php.h" #include "fopen-wrappers.h" -#include "php3_dir.h" +#include "php_dir.h" #ifdef HAVE_DIRENT_H # include <dirent.h> Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.17 php4/ext/standard/exec.c:1.18 --- php4/ext/standard/exec.c:1.17 Wed Nov 24 12:56:31 1999 +++ php4/ext/standard/exec.c Sat Dec 4 14:16:03 1999 @@ -15,12 +15,12 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.17 1999/11/24 17:56:31 sas Exp $ */ +/* $Id: exec.c,v 1.18 1999/12/04 19:16:03 sas Exp $ */ #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" Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.44 php4/ext/standard/file.c:1.45 --- php4/ext/standard/file.c:1.44 Tue Nov 30 15:18:11 1999 +++ php4/ext/standard/file.c Sat Dec 4 14:16:03 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.44 1999/11/30 20:18:11 andi Exp $ */ +/* $Id: file.c,v 1.45 1999/12/04 19:16:03 sas Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -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 Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.13 php4/ext/standard/filestat.c:1.14 --- php4/ext/standard/filestat.c:1.13 Tue Aug 17 08:32:23 1999 +++ php4/ext/standard/filestat.c Sat Dec 4 14:16:03 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.13 1999/08/17 12:32:23 thies Exp $ */ +/* $Id: filestat.c,v 1.14 1999/12/04 19:16:03 sas Exp $ */ #include "php.h" #include "safe_mode.h" @@ -69,7 +69,7 @@ # endif #endif -#include "php3_filestat.h" +#include "php_filestat.h" #ifndef THREAD_SAFE static char *CurrentStatFile=NULL; Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.10 php4/ext/standard/formatted_print.c:1.11 --- php4/ext/standard/formatted_print.c:1.10 Tue Nov 23 01:46:39 1999 +++ php4/ext/standard/formatted_print.c Sat Dec 4 14:16:03 1999 @@ -16,12 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.10 1999/11/23 06:46:39 evan Exp $ */ +/* $Id: formatted_print.c,v 1.11 1999/12/04 19:16:03 sas Exp $ */ #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> Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.18 php4/ext/standard/head.c:1.19 --- php4/ext/standard/head.c:1.18 Mon Aug 2 15:16:50 1999 +++ php4/ext/standard/head.c Sat Dec 4 14:16:03 1999 @@ -15,11 +15,11 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.18 1999/08/02 19:16:50 zeev Exp $ */ +/* $Id: head.c,v 1.19 1999/12/04 19:16:03 sas Exp $ */ #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" Index: php4/ext/standard/iptc.c diff -u php4/ext/standard/iptc.c:1.7 php4/ext/standard/iptc.c:1.8 --- php4/ext/standard/iptc.c:1.7 Mon Aug 2 15:16:50 1999 +++ php4/ext/standard/iptc.c Sat Dec 4 14:16:03 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iptc.c,v 1.7 1999/08/02 19:16:50 zeev Exp $ */ +/* $Id: iptc.c,v 1.8 1999/12/04 19:16:03 sas Exp $ */ /* * Functions to parse & compse IPTC data. @@ -33,7 +33,7 @@ */ #include "php.h" -#include "php3_iptc.h" +#include "php_iptc.h" #include "ext/standard/head.h" #include <sys/stat.h> Index: php4/ext/standard/link.c diff -u php4/ext/standard/link.c:1.12 php4/ext/standard/link.c:1.13 --- php4/ext/standard/link.c:1.12 Sun Nov 28 11:35:26 1999 +++ php4/ext/standard/link.c Sat Dec 4 14:16:03 1999 @@ -16,10 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.12 1999/11/28 16:35:26 rasmus Exp $ */ +/* $Id: link.c,v 1.13 1999/12/04 19:16:03 sas Exp $ */ #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 */ Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.10 php4/ext/standard/mail.c:1.11 --- php4/ext/standard/mail.c:1.10 Sat Sep 25 08:09:50 1999 +++ php4/ext/standard/mail.c Sat Dec 4 14:16:03 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.10 1999/09/25 12:09:50 sas Exp $ */ +/* $Id: mail.c,v 1.11 1999/12/04 19:16:03 sas Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -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 Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.9 php4/ext/standard/pack.c:1.10 --- php4/ext/standard/pack.c:1.9 Mon Aug 2 15:16:50 1999 +++ php4/ext/standard/pack.c Sat Dec 4 14:16:03 1999 @@ -15,7 +15,7 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.9 1999/08/02 19:16:50 zeev Exp $ */ +/* $Id: pack.c,v 1.10 1999/12/04 19:16:03 sas Exp $ */ #include "php.h" @@ -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 Index: php4/ext/standard/post.c diff -u php4/ext/standard/post.c:1.29 php4/ext/standard/post.c:1.30 --- php4/ext/standard/post.c:1.29 Wed Dec 1 16:30:45 1999 +++ php4/ext/standard/post.c Sat Dec 4 14:16:04 1999 @@ -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" Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.23 php4/ext/standard/reg.c:1.24 --- php4/ext/standard/reg.c:1.23 Sat Nov 13 11:51:31 1999 +++ php4/ext/standard/reg.c Sat Dec 4 14:16:06 1999 @@ -17,11 +17,11 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.23 1999/11/13 16:51:31 sas Exp $ */ +/* $Id: reg.c,v 1.24 1999/12/04 19:16:06 sas Exp $ */ #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 }; Index: php4/ext/standard/soundex.c diff -u php4/ext/standard/soundex.c:1.7 php4/ext/standard/soundex.c:1.8 --- php4/ext/standard/soundex.c:1.7 Sat Sep 25 08:09:50 1999 +++ php4/ext/standard/soundex.c Sat Dec 4 14:16:06 1999 @@ -15,13 +15,13 @@ | Author: Bjørn Borud - Guardian Networks AS <borud@guardian.no> | +----------------------------------------------------------------------+ */ -/* $Id: soundex.c,v 1.7 1999/09/25 12:09:50 sas Exp $ */ +/* $Id: soundex.c,v 1.8 1999/12/04 19:16:06 sas Exp $ */ #include "php.h" #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) Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.61 php4/ext/standard/string.c:1.62 --- php4/ext/standard/string.c:1.61 Wed Dec 1 12:21:52 1999 +++ php4/ext/standard/string.c Sat Dec 4 14:16:06 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.61 1999/12/01 17:21:52 sas Exp $ */ +/* $Id: string.c,v 1.62 1999/12/04 19:16:06 sas Exp $ */ /* Synced with php3 revision 1.193 1999-06-16 [ssb] */ @@ -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 Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.8 php4/ext/standard/syslog.c:1.9 --- php4/ext/standard/syslog.c:1.8 Sat Sep 25 08:09:50 1999 +++ php4/ext/standard/syslog.c Sat Dec 4 14:16:07 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.8 1999/09/25 12:09:50 sas Exp $ */ +/* $Id: syslog.c,v 1.9 1999/12/04 19:16:07 sas Exp $ */ #include "php.h" #include "php_ini.h" @@ -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; Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.34 php4/ext/standard/var.c:1.35 --- php4/ext/standard/var.c:1.34 Sat Nov 6 03:16:25 1999 +++ php4/ext/standard/var.c Sat Dec 4 14:16:07 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.34 1999/11/06 08:16:25 thies Exp $ */ +/* $Id: var.c,v 1.35 1999/12/04 19:16:07 sas Exp $ */ /* {{{ includes @@ -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 */ Index: php4/ext/sybase/sybase.c diff -u php4/ext/sybase/sybase.c:1.15 php4/ext/sybase/sybase.c:1.16 --- php4/ext/sybase/sybase.c:1.15 Fri Nov 19 08:06:11 1999 +++ php4/ext/sybase/sybase.c Sat Dec 4 14:16:07 1999 @@ -20,12 +20,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: sybase.c,v 1.15 1999/11/19 13:06:11 zeev Exp $ */ +/* $Id: sybase.c,v 1.16 1999/12/04 19:16:07 sas Exp $ */ #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 Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.9 php4/ext/sybase_ct/php_sybase_ct.c:1.10 --- php4/ext/sybase_ct/php_sybase_ct.c:1.9 Fri Nov 19 08:06:12 1999 +++ php4/ext/sybase_ct/php_sybase_ct.c Sat Dec 4 14:16:08 1999 @@ -17,12 +17,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.9 1999/11/19 13:06:12 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.10 1999/12/04 19:16:08 sas Exp $ */ #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 Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.9 php4/ext/sysvsem/sysvsem.c:1.10 --- php4/ext/sysvsem/sysvsem.c:1.9 Fri Sep 24 15:13:34 1999 +++ php4/ext/sysvsem/sysvsem.c Sat Dec 4 14:16:08 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.9 1999/09/24 19:13:34 sas Exp $ */ +/* $Id: sysvsem.c,v 1.10 1999/12/04 19:16:08 sas Exp $ */ /* This has been built and tested on Solaris 2.6 and Linux 2.1.122. * It may not compile or execute correctly on other systems. @@ -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 Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.9 php4/ext/sysvshm/sysvshm.c:1.10 --- php4/ext/sysvshm/sysvshm.c:1.9 Fri Sep 24 15:13:34 1999 +++ php4/ext/sysvshm/sysvshm.c Sat Dec 4 14:16:09 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.9 1999/09/24 19:13:34 sas Exp $ */ +/* $Id: sysvshm.c,v 1.10 1999/12/04 19:16:09 sas Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -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) Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.30 php4/ext/xml/xml.c:1.31 --- php4/ext/xml/xml.c:1.30 Sat Dec 4 09:45:38 1999 +++ php4/ext/xml/xml.c Sat Dec 4 14:16:10 1999 @@ -17,13 +17,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.30 1999/12/04 14:45:38 ssb Exp $ */ +/* $Id: xml.c,v 1.31 1999/12/04 19:16:10 sas Exp $ */ #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 Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.2 php4/ext/yp/yp.c:1.3 --- php4/ext/yp/yp.c:1.2 Fri Jul 16 09:12:58 1999 +++ php4/ext/yp/yp.c Sat Dec 4 14:16:10 1999 @@ -15,13 +15,13 @@ | Authors: Stephanie Wehner <_@r4k.net> | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.2 1999/07/16 13:12:58 zeev Exp $ */ +/* $Id: yp.c,v 1.3 1999/12/04 19:16:10 sas Exp $ */ #include "php.h" #if HAVE_YP -#include "php3_yp.h" +#include "php_yp.h" #include <rpcsvc/ypclnt.h> Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.23 php4/ext/zlib/zlib.c:1.24 --- php4/ext/zlib/zlib.c:1.23 Sat Oct 16 20:20:17 1999 +++ php4/ext/zlib/zlib.c Sat Dec 4 14:16:11 1999 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.23 1999/10/17 00:20:17 andrei Exp $ */ +/* $Id: zlib.c,v 1.24 1999/12/04 19:16:11 sas Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -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 Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.4 php4/sapi/apache/mod_php4.c:1.5 --- php4/sapi/apache/mod_php4.c:1.4 Sat Oct 30 10:22:10 1999 +++ php4/sapi/apache/mod_php4.c Sat Dec 4 14:16:11 1999 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.4 1999/10/30 14:22:10 rasmus Exp $ */ +/* $Id: mod_php4.c,v 1.5 1999/12/04 19:16:11 sas Exp $ */ #include "zend.h" #include "php.h" @@ -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" Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.3 php4/sapi/apache/sapi_apache.c:1.4 --- php4/sapi/apache/sapi_apache.c:1.3 Sat Dec 4 08:25:39 1999 +++ php4/sapi/apache/sapi_apache.c Sat Dec 4 14:16:12 1999 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.3 1999/12/04 13:25:39 zeev Exp $ */ +/* $Id: sapi_apache.c,v 1.4 1999/12/04 19:16:12 sas Exp $ */ #include "php.h" @@ -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"*/ Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.7 php4/sapi/cgi/cgi_main.c:1.8 --- php4/sapi/cgi/cgi_main.c:1.7 Sat Dec 4 13:05:02 1999 +++ php4/sapi/cgi/cgi_main.c Sat Dec 4 14:16:12 1999 @@ -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> Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.3 php4/sapi/servlet/servlet.c:1.4 --- php4/sapi/servlet/servlet.c:1.3 Sat Dec 4 13:05:03 1999 +++ php4/sapi/servlet/servlet.c Sat Dec 4 14:16:13 1999 @@ -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>