cvs: php4 /ext/bcmath php_bcmath.h /ext/calendar sdncal.h /ext/com php_COM.h /ext/cpdf php_cpdf.h /ext/cybercash cybercash.h /ext/dav php_dav.h
/ext/db php_db.h /ext/dba php_cdb.h php_db2.h php_db3.h php_dbm.h php_gdbm.h php_ndbm.h /ext/dbase dbf.h dbf_ndx.h /ext/domxml php_domxml.h
/ext/fdf php_fdf.h /ext/ftp ftp.h /ext/gd php_gd.h /ext/hyperwave debug.h hg_comm.h hw_error.h /ext/ldap php_ldap.h /ext/msql php_msql.h
/ext/mssql php_mssql.h /ext/mysql php_mysql.h /ext/oci8 php_oci8.h /ext/odbc php_odbc.h php_velocis.h /ext/oracle php_oracle.h /ext/pcre
php_pcre.h /ext/pcre/pcrelib pcre.h pcreposix.h /ext/pdf php_pdf.h /ext/pgsql php_pgsql.h /ext/posix php_posix.h /ext/readline php_readline.h
/ext/recode php_recode.h /ext/snmp php_snmp.h /ext/standard basic_functions.h cyr_convert.h datetime.h dl.h dns.h exec.h file.h flock_compat.h
fsock.h head.h html.h info.h microtime.h pack.h php_array.h php_assert.h php_browscap.h php_dir.h php_ext_syslog.h php_link.h php_rand.h quot_print.h
reg.h type.h uniqid.h url.h /ext/swf php_swf.h /ext/sybase_ct php_sybase_ct.h /ext/sysvsem php_sysvsem.h /ext/sysvshm php_sysvshm.h /ext/xml
php_xml.h /ext/yp php_yp.h /ext/zlib php_zlib.h /main SAPI.h internal_functions_registry.h php.h php_content_types.h php_globals.h php_ini.h
php_realpath.h php_regex.h php_ticks.h php_variables.h rfc1867.h safe_mode.h snprintf.h /sapi/apache mod_php4.h /win32 php_registry.h pwd.h
readdir.h time.h

sas Sun Jul 2 16:46:53 2000 EDT Modified files: /php4/ext/bcmath php_bcmath.h /php4/ext/calendar sdncal.h /php4/ext/com php_COM.h /php4/ext/cpdf php_cpdf.h /php4/ext/cybercash cybercash.h /php4/ext/dav php_dav.h /php4/ext/db php_db.h /php4/ext/dba php_cdb.h php_db2.h php_db3.h php_dbm.h php_gdbm.h php_ndbm.h /php4/ext/dbase dbf.h dbf_ndx.h /php4/ext/domxml php_domxml.h /php4/ext/fdf php_fdf.h /php4/ext/ftp ftp.h /php4/ext/gd php_gd.h /php4/ext/hyperwave debug.h hg_comm.h hw_error.h /php4/ext/ldap php_ldap.h /php4/ext/msql php_msql.h /php4/ext/mssql php_mssql.h /php4/ext/mysql php_mysql.h /php4/ext/oci8 php_oci8.h /php4/ext/odbc php_odbc.h php_velocis.h /php4/ext/oracle php_oracle.h /php4/ext/pcre php_pcre.h /php4/ext/pcre/pcrelib pcre.h pcreposix.h /php4/ext/pdf php_pdf.h /php4/ext/pgsql php_pgsql.h /php4/ext/posix php_posix.h /php4/ext/readline php_readline.h /php4/ext/recode php_recode.h /php4/ext/snmp php_snmp.h /php4/ext/standard basic_functions.h cyr_convert.h datetime.h dl.h dns.h exec.h file.h flock_compat.h fsock.h head.h html.h info.h microtime.h pack.h php_array.h php_assert.h php_browscap.h php_dir.h php_ext_syslog.h php_link.h php_rand.h quot_print.h reg.h type.h uniqid.h url.h /php4/ext/swf php_swf.h /php4/ext/sybase_ct php_sybase_ct.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/main SAPI.h internal_functions_registry.h php.h php_content_types.h php_globals.h php_ini.h php_realpath.h php_regex.h php_ticks.h php_variables.h rfc1867.h safe_mode.h snprintf.h /php4/sapi/apache mod_php4.h /php4/win32 php_registry.h pwd.h readdir.h time.h Log: Change header protection macros to conform to standard. Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment" All identifiers that begin with an underscore and either an uppercase letter or another underscore are always reserved for any use by the implementation. Index: php4/ext/bcmath/php_bcmath.h diff -u php4/ext/bcmath/php_bcmath.h:1.3 php4/ext/bcmath/php_bcmath.h:1.4 --- php4/ext/bcmath/php_bcmath.h:1.3 Sat Jun 10 01:47:56 2000 +++ php4/ext/bcmath/php_bcmath.h Sun Jul 2 16:46:38 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_bcmath.h,v 1.3 2000/06/10 08:47:56 andi Exp $ */ +/* $Id: php_bcmath.h,v 1.4 2000/07/02 23:46:38 sas Exp $ */ -#ifndef _PHP_BCMATH_H -#define _PHP_BCMATH_H +#ifndef PHP_BCMATH_H +#define PHP_BCMATH_H #if WITH_BCMATH @@ -56,4 +56,4 @@ #endif -#endif /* _PHP_BCMATH_H */ +#endif /* PHP_BCMATH_H */ Index: php4/ext/calendar/sdncal.h diff -u php4/ext/calendar/sdncal.h:1.1 php4/ext/calendar/sdncal.h:1.2 --- php4/ext/calendar/sdncal.h:1.1 Sat Apr 15 13:35:09 2000 +++ php4/ext/calendar/sdncal.h Sun Jul 2 16:46:38 2000 @@ -1,5 +1,5 @@ -#ifndef _INCLUDED_SDNCAL_H -#define _INCLUDED_SDNCAL_H +#ifndef SDNCAL_H +#define SDNCAL_H /* * This code has been modified for use with PHP * by Shane Caraveo shane@caraveo.com @@ -93,4 +93,4 @@ extern char *DayNameShort[7]; extern char *DayNameLong[7]; -#endif /* _INCLUDED_SDNCAL_H */ +#endif /* SDNCAL_H */ Index: php4/ext/com/php_COM.h diff -u php4/ext/com/php_COM.h:1.1 php4/ext/com/php_COM.h:1.2 --- php4/ext/com/php_COM.h:1.1 Wed Oct 20 11:09:44 1999 +++ php4/ext/com/php_COM.h Sun Jul 2 16:46:38 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_COM_H -#define _PHP_COM_H +#ifndef PHP_COM_H +#define PHP_COM_H #if WIN32|WINNT @@ -21,4 +21,4 @@ #define phpext_COM_ptr COM_module_ptr -#endif /* _PHP_COM_H */ +#endif /* PHP_COM_H */ Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.5 php4/ext/cpdf/php_cpdf.h:1.6 --- php4/ext/cpdf/php_cpdf.h:1.5 Fri Feb 25 19:20:48 2000 +++ php4/ext/cpdf/php_cpdf.h Sun Jul 2 16:46:38 2000 @@ -26,10 +26,10 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_cpdf.h,v 1.5 2000/02/26 03:20:48 zeev Exp $ */ +/* $Id: php_cpdf.h,v 1.6 2000/07/02 23:46:38 sas Exp $ */ -#ifndef _PHP_CPDF_H -#define _PHP_CPDF_H +#ifndef PHP_CPDF_H +#define PHP_CPDF_H #if HAVE_CPDFLIB Index: php4/ext/cybercash/cybercash.h diff -u php4/ext/cybercash/cybercash.h:1.4 php4/ext/cybercash/cybercash.h:1.5 --- php4/ext/cybercash/cybercash.h:1.4 Fri Jun 30 18:42:51 2000 +++ php4/ext/cybercash/cybercash.h Sun Jul 2 16:46:39 2000 @@ -27,8 +27,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _CYBERCASH_H -#define _CYBERCASH_H +#ifndef CYBERCASH_H +#define CYBERCASH_H #if HAVE_MCK Index: php4/ext/dav/php_dav.h diff -u php4/ext/dav/php_dav.h:1.2 php4/ext/dav/php_dav.h:1.3 --- php4/ext/dav/php_dav.h:1.2 Fri Dec 17 12:54:48 1999 +++ php4/ext/dav/php_dav.h Sun Jul 2 16:46:39 2000 @@ -29,10 +29,10 @@ /* $Id */ -#ifndef _PHP_DAV_H -# define _PHP_DAV_H +#ifndef PHP_DAV_H +#define PHP_DAV_H -# if HAVE_MOD_DAV +#if HAVE_MOD_DAV typedef struct { int foo; @@ -41,21 +41,21 @@ } phpdav_module; extern zend_module_entry phpdav_module_entry; -# define phpdav_module_ptr &phpdav_module_entry +#define phpdav_module_ptr &phpdav_module_entry int phpdav_mkcol_test_handler(request_rec *); PHP_FUNCTION(dav_set_mkcol_handlers); -# else /* !HAVE_MOD_DAV */ +#else /* !HAVE_MOD_DAV */ -# define phpdav_module_ptr NULL +#define phpdav_module_ptr NULL -# endif /* HAVE_MOD_DAV */ +#endif /* HAVE_MOD_DAV */ #define phpext_dav_ptr phpdav_module_ptr -#endif /* _PHP_DAV_H */ +#endif /* PHP_DAV_H */ /* Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.6 php4/ext/db/php_db.h:1.7 --- php4/ext/db/php_db.h:1.6 Sat Jun 10 01:47:56 2000 +++ php4/ext/db/php_db.h Sun Jul 2 16:46:39 2000 @@ -28,11 +28,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.6 2000/06/10 08:47:56 andi Exp $ */ +/* $Id: php_db.h,v 1.7 2000/07/02 23:46:39 sas Exp $ */ -#ifndef _PHP_DB_H -#define _PHP_DB_H +#ifndef PHP_DB_H +#define PHP_DB_H #ifndef DLEXPORT @@ -89,4 +89,4 @@ PHP_FUNCTION(dbmfirstkey); PHP_FUNCTION(dbmnextkey); -#endif /* _PHP_DB_H */ +#endif /* PHP_DB_H */ Index: php4/ext/dba/php_cdb.h diff -u php4/ext/dba/php_cdb.h:1.1 php4/ext/dba/php_cdb.h:1.2 --- php4/ext/dba/php_cdb.h:1.1 Sat Dec 4 11:19:54 1999 +++ php4/ext/dba/php_cdb.h Sun Jul 2 16:46:40 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_CDB_H -#define _PHP_CDB_H +#ifndef PHP_CDB_H +#define PHP_CDB_H #if DBA_CDB Index: php4/ext/dba/php_db2.h diff -u php4/ext/dba/php_db2.h:1.1 php4/ext/dba/php_db2.h:1.2 --- php4/ext/dba/php_db2.h:1.1 Sat Dec 4 11:19:54 1999 +++ php4/ext/dba/php_db2.h Sun Jul 2 16:46:40 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_DB2_H -#define _PHP_DB2_H +#ifndef PHP_DB2_H +#define PHP_DB2_H #if DBA_DB2 Index: php4/ext/dba/php_db3.h diff -u php4/ext/dba/php_db3.h:1.1 php4/ext/dba/php_db3.h:1.2 --- php4/ext/dba/php_db3.h:1.1 Sat Dec 4 11:19:54 1999 +++ php4/ext/dba/php_db3.h Sun Jul 2 16:46:40 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_DB3_H -#define _PHP_DB3_H +#ifndef PHP_DB3_H +#define PHP_DB3_H #if DBA_DB3 Index: php4/ext/dba/php_dbm.h diff -u php4/ext/dba/php_dbm.h:1.1 php4/ext/dba/php_dbm.h:1.2 --- php4/ext/dba/php_dbm.h:1.1 Sat Dec 4 11:19:54 1999 +++ php4/ext/dba/php_dbm.h Sun Jul 2 16:46:40 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_DBM_H -#define _PHP_DBM_H +#ifndef PHP_DBM_H +#define PHP_DBM_H #if DBA_DBM Index: php4/ext/dba/php_gdbm.h diff -u php4/ext/dba/php_gdbm.h:1.1 php4/ext/dba/php_gdbm.h:1.2 --- php4/ext/dba/php_gdbm.h:1.1 Sat Dec 4 11:19:54 1999 +++ php4/ext/dba/php_gdbm.h Sun Jul 2 16:46:40 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_GDBM_H -#define _PHP_GDBM_H +#ifndef PHP_GDBM_H +#define PHP_GDBM_H #if DBA_GDBM Index: php4/ext/dba/php_ndbm.h diff -u php4/ext/dba/php_ndbm.h:1.1 php4/ext/dba/php_ndbm.h:1.2 --- php4/ext/dba/php_ndbm.h:1.1 Sat Dec 4 11:19:54 1999 +++ php4/ext/dba/php_ndbm.h Sun Jul 2 16:46:40 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_NDBM_H -#define _PHP_NDBM_H +#ifndef PHP_NDBM_H +#define PHP_NDBM_H #if DBA_NDBM Index: php4/ext/dbase/dbf.h diff -u php4/ext/dbase/dbf.h:1.1 php4/ext/dbase/dbf.h:1.2 --- php4/ext/dbase/dbf.h:1.1 Mon Apr 19 06:56:50 1999 +++ php4/ext/dbase/dbf.h Sun Jul 2 16:46:40 2000 @@ -13,8 +13,8 @@ * (c) 1986 John Wiley & Sons, Inc. */ -#ifndef _DBF_H_ -#define _DBF_H_ +#ifndef DBF_H_ +#define DBF_H_ #include <stdlib.h> #include <string.h> @@ -91,4 +91,4 @@ #include "dbf_misc.h" #include "dbf_rec.h" -#endif /* _DBF_H_ */ +#endif /* DBF_H_ */ Index: php4/ext/dbase/dbf_ndx.h diff -u php4/ext/dbase/dbf_ndx.h:1.1 php4/ext/dbase/dbf_ndx.h:1.2 --- php4/ext/dbase/dbf_ndx.h:1.1 Mon Apr 19 06:56:50 1999 +++ php4/ext/dbase/dbf_ndx.h Sun Jul 2 16:46:40 2000 @@ -12,8 +12,8 @@ * by Rick Spence */ -#ifndef _DBF_NDX_H_ -#define _DBF_NDX_H_ +#ifndef DBF_NDX_H_ +#define DBF_NDX_H_ #include "dbf.h" @@ -95,4 +95,4 @@ extern ndx_record_t *ndx_get_first_rec(ndx_header_t *); extern ndx_record_t *ndx_get_next_rec(ndx_header_t *, ndx_record_t *); -#endif /* _DBF_NDX_H_ */ +#endif /* DBF_NDX_H_ */ Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.12 php4/ext/domxml/php_domxml.h:1.13 --- php4/ext/domxml/php_domxml.h:1.12 Mon Jun 5 08:39:29 2000 +++ php4/ext/domxml/php_domxml.h Sun Jul 2 16:46:40 2000 @@ -29,10 +29,10 @@ */ -/* $Id: php_domxml.h,v 1.12 2000/06/05 15:39:29 steinm Exp $ */ +/* $Id: php_domxml.h,v 1.13 2000/07/02 23:46:40 sas Exp $ */ -#ifndef _PHP_DOMXML_H -#define _PHP_DOMXML_H +#ifndef PHP_DOMXML_H +#define PHP_DOMXML_H #if HAVE_DOMXML #include <libxml/parser.h> Index: php4/ext/fdf/php_fdf.h diff -u php4/ext/fdf/php_fdf.h:1.2 php4/ext/fdf/php_fdf.h:1.3 --- php4/ext/fdf/php_fdf.h:1.2 Fri Dec 17 12:54:55 1999 +++ php4/ext/fdf/php_fdf.h Sun Jul 2 16:46:40 2000 @@ -26,10 +26,10 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_fdf.h,v 1.2 1999/12/17 20:54:55 zeev Exp $ */ +/* $Id: php_fdf.h,v 1.3 2000/07/02 23:46:40 sas Exp $ */ -#ifndef _PHP_FDF_H -#define _PHP_FDF_H +#ifndef PHP_FDF_H +#define PHP_FDF_H #if HAVE_FDFLIB #if WIN32|WINNT @@ -62,4 +62,4 @@ #else #define phpext_fdf_ptr NULL #endif -#endif /* _PHP_FDF_H */ +#endif /* PHP_FDF_H */ Index: php4/ext/ftp/ftp.h diff -u php4/ext/ftp/ftp.h:1.12 php4/ext/ftp/ftp.h:1.13 --- php4/ext/ftp/ftp.h:1.12 Tue May 23 03:12:42 2000 +++ php4/ext/ftp/ftp.h Sun Jul 2 16:46:41 2000 @@ -28,10 +28,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftp.h,v 1.12 2000/05/23 10:12:42 thies Exp $ */ +/* $Id: ftp.h,v 1.13 2000/07/02 23:46:41 sas Exp $ */ -#ifndef _FTP_H -#define _FTP_H +#ifndef FTP_H +#define FTP_H #include <stdio.h> #ifdef HAVE_NETINET_IN_H Index: php4/ext/gd/php_gd.h diff -u php4/ext/gd/php_gd.h:1.13 php4/ext/gd/php_gd.h:1.14 --- php4/ext/gd/php_gd.h:1.13 Sat Jun 24 19:55:31 2000 +++ php4/ext/gd/php_gd.h Sun Jul 2 16:46:41 2000 @@ -29,10 +29,10 @@ */ -/* $Id: php_gd.h,v 1.13 2000/06/25 02:55:31 sterling Exp $ */ +/* $Id: php_gd.h,v 1.14 2000/07/02 23:46:41 sas Exp $ */ -#ifndef _PHP_GD_H -#define _PHP_GD_H +#ifndef PHP_GD_H +#define PHP_GD_H #define HAVE_GDIMAGECREATEFROMPNG 1 @@ -159,4 +159,4 @@ #endif -#endif /* _PHP_GD_H */ +#endif /* PHP_GD_H */ Index: php4/ext/hyperwave/debug.h diff -u php4/ext/hyperwave/debug.h:1.1 php4/ext/hyperwave/debug.h:1.2 --- php4/ext/hyperwave/debug.h:1.1 Wed Apr 21 16:37:47 1999 +++ php4/ext/hyperwave/debug.h Sun Jul 2 16:46:41 2000 @@ -4,19 +4,28 @@ * All rights reserved. * * Filename: $RCSfile: debug.h,v $ -* Version: $Revision: 1.1 $ +* Version: $Revision: 1.2 $ * * Language: ANSI C * Environment: any * * Description: General header file for portable code. * -* $Id: debug.h,v 1.1 1999/04/21 23:37:47 ssb Exp $ +* $Id: debug.h,v 1.2 2000/07/02 23:46:41 sas Exp $ * * Revision History: * ----------------- * * $Log: debug.h,v $ +* Revision 1.2 2000/07/02 23:46:41 sas +* Change header protection macros to conform to standard. +* +* Draft 3 of IEEE 1003.1 200x, "2.2 The Compilation Environment" +* +* All identifiers that begin with an underscore and either an uppercase +* letter or another underscore are always reserved for any use by the +* implementation. +* * Revision 1.1 1999/04/21 23:37:47 ssb * moved db * @@ -52,8 +61,8 @@ * ****************************************************************************/ -#ifndef __DEBUG_H -#define __DEBUG_H +#ifndef DEBUG_H +#define DEBUG_H #ifdef DEBUG # define D(x) x @@ -194,4 +203,4 @@ #define NO 0 #define YES 1 -#endif __DEBUG_H +#endif /* DEBUG_H */ Index: php4/ext/hyperwave/hg_comm.h diff -u php4/ext/hyperwave/hg_comm.h:1.7 php4/ext/hyperwave/hg_comm.h:1.8 --- php4/ext/hyperwave/hg_comm.h:1.7 Thu Jun 15 16:45:04 2000 +++ php4/ext/hyperwave/hg_comm.h Sun Jul 2 16:46:41 2000 @@ -23,10 +23,10 @@ */ -/* $Id: hg_comm.h,v 1.7 2000/06/15 23:45:04 andi Exp $ */ +/* $Id: hg_comm.h,v 1.8 2000/07/02 23:46:41 sas Exp $ */ -#ifndef _HG_COMM_H -#define _HG_COMM_H +#ifndef HG_COMM_H +#define HG_COMM_H #if HYPERWAVE Index: php4/ext/hyperwave/hw_error.h diff -u php4/ext/hyperwave/hw_error.h:1.2 php4/ext/hyperwave/hw_error.h:1.3 --- php4/ext/hyperwave/hw_error.h:1.2 Thu Aug 5 09:25:10 1999 +++ php4/ext/hyperwave/hw_error.h Sun Jul 2 16:46:41 2000 @@ -23,9 +23,9 @@ */ -/* $Id: hw_error.h,v 1.2 1999/08/05 16:25:10 steinm Exp $ */ -#ifndef _HW_ERROR_H -#define _HW_ERROR_H +/* $Id: hw_error.h,v 1.3 2000/07/02 23:46:41 sas Exp $ */ +#ifndef HW_ERROR_H +#define HW_ERROR_H #if HYPERWAVE Index: php4/ext/ldap/php_ldap.h diff -u php4/ext/ldap/php_ldap.h:1.6 php4/ext/ldap/php_ldap.h:1.7 --- php4/ext/ldap/php_ldap.h:1.6 Fri Apr 7 16:20:22 2000 +++ php4/ext/ldap/php_ldap.h Sun Jul 2 16:46:42 2000 @@ -29,10 +29,10 @@ */ -/* $Id: php_ldap.h,v 1.6 2000/04/07 23:20:22 sterling Exp $ */ +/* $Id: php_ldap.h,v 1.7 2000/07/02 23:46:42 sas Exp $ */ -#ifndef _PHP_LDAP_H -#define _PHP_LDAP_H +#ifndef PHP_LDAP_H +#define PHP_LDAP_H #include <lber.h> #include <ldap.h> @@ -113,4 +113,4 @@ #define phpext_ldap_ptr ldap_module_ptr -#endif /* _PHP_LDAP_H */ +#endif /* PHP_LDAP_H */ Index: php4/ext/msql/php_msql.h diff -u php4/ext/msql/php_msql.h:1.3 php4/ext/msql/php_msql.h:1.4 --- php4/ext/msql/php_msql.h:1.3 Sat Jun 10 01:47:57 2000 +++ php4/ext/msql/php_msql.h Sun Jul 2 16:46:42 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_msql.h,v 1.3 2000/06/10 08:47:57 andi Exp $ */ +/* $Id: php_msql.h,v 1.4 2000/07/02 23:46:42 sas Exp $ */ -#ifndef _PHP_MSQL_H -#define _PHP_MSQL_H +#ifndef PHP_MSQL_H +#define PHP_MSQL_H #if HAVE_MSQL @@ -91,4 +91,4 @@ #define phpext_msql_ptr msql_module_ptr -#endif /* _PHP_MSQL_H */ +#endif /* PHP_MSQL_H */ Index: php4/ext/mssql/php_mssql.h diff -u php4/ext/mssql/php_mssql.h:1.6 php4/ext/mssql/php_mssql.h:1.7 --- php4/ext/mssql/php_mssql.h:1.6 Thu May 18 08:34:29 2000 +++ php4/ext/mssql/php_mssql.h Sun Jul 2 16:46:42 2000 @@ -17,10 +17,10 @@ */ -/* $Id: php_mssql.h,v 1.6 2000/05/18 15:34:29 zeev Exp $ */ +/* $Id: php_mssql.h,v 1.7 2000/07/02 23:46:42 sas Exp $ */ -#ifndef _PHP_MSSQL_H -#define _PHP_MSSQL_H +#ifndef PHP_MSSQL_H +#define PHP_MSSQL_H #if HAVE_MSSQL @@ -154,4 +154,4 @@ #define phpext_mssql_ptr mssql_module_ptr -#endif /* _PHP_MSSQL_H */ +#endif /* PHP_MSSQL_H */ Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.13 php4/ext/mysql/php_mysql.h:1.14 --- php4/ext/mysql/php_mysql.h:1.13 Mon Jun 19 05:56:30 2000 +++ php4/ext/mysql/php_mysql.h Sun Jul 2 16:46:43 2000 @@ -17,10 +17,10 @@ */ -/* $Id: php_mysql.h,v 1.13 2000/06/19 12:56:30 thies Exp $ */ +/* $Id: php_mysql.h,v 1.14 2000/07/02 23:46:43 sas Exp $ */ -#ifndef _PHP_MYSQL_H -#define _PHP_MYSQL_H +#ifndef PHP_MYSQL_H +#define PHP_MYSQL_H #ifdef PHP_WIN32 #define PHP_MYSQL_API __declspec(dllexport) @@ -110,4 +110,4 @@ #define phpext_mysql_ptr mysql_module_ptr -#endif /* _PHP_MYSQL_H */ +#endif /* PHP_MYSQL_H */ Index: php4/ext/oci8/php_oci8.h diff -u php4/ext/oci8/php_oci8.h:1.8 php4/ext/oci8/php_oci8.h:1.9 --- php4/ext/oci8/php_oci8.h:1.8 Mon Mar 6 00:02:15 2000 +++ php4/ext/oci8/php_oci8.h Sun Jul 2 16:46:43 2000 @@ -31,8 +31,8 @@ /* $Id */ #if HAVE_OCI8 -# ifndef _PHP_OCI8_H -# define _PHP_OCI8_H +# ifndef PHP_OCI8_H +# define PHP_OCI8_H # endif # if (defined(__osf__) && defined(__alpha)) Index: php4/ext/odbc/php_odbc.h diff -u php4/ext/odbc/php_odbc.h:1.22 php4/ext/odbc/php_odbc.h:1.23 --- php4/ext/odbc/php_odbc.h:1.22 Fri Jun 30 12:22:52 2000 +++ php4/ext/odbc/php_odbc.h Sun Jul 2 16:46:44 2000 @@ -28,10 +28,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.22 2000/06/30 19:22:52 kalowsky Exp $ */ +/* $Id: php_odbc.h,v 1.23 2000/07/02 23:46:44 sas Exp $ */ -#ifndef _PHP_ODBC_H -#define _PHP_ODBC_H +#ifndef PHP_ODBC_H +#define PHP_ODBC_H #if HAVE_UODBC #define ODBCVER 0x0250 @@ -320,7 +320,7 @@ #define phpext_odbc_ptr odbc_module_ptr -#endif /* _PHP_ODBC_H */ +#endif /* PHP_ODBC_H */ /* * Local variables: Index: php4/ext/odbc/php_velocis.h diff -u php4/ext/odbc/php_velocis.h:1.4 php4/ext/odbc/php_velocis.h:1.5 --- php4/ext/odbc/php_velocis.h:1.4 Sat Jun 10 01:47:57 2000 +++ php4/ext/odbc/php_velocis.h Sun Jul 2 16:46:44 2000 @@ -28,10 +28,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_velocis.h,v 1.4 2000/06/10 08:47:57 andi Exp $ */ +/* $Id: php_velocis.h,v 1.5 2000/07/02 23:46:44 sas Exp $ */ -#ifndef _PHP_VELOCIS_H -#define _PHP_VELOCIS_H +#ifndef PHP_VELOCIS_H +#define PHP_VELOCIS_H #if defined(HAVE_VELOCIS) && !HAVE_UODBC #define UNIX @@ -94,7 +94,7 @@ #define velocis_module_ptr NULL #endif /* HAVE_VELOCIS */ -#endif /* _PHP_VELOCIS_H */ +#endif /* PHP_VELOCIS_H */ /* * Local variables: Index: php4/ext/oracle/php_oracle.h diff -u php4/ext/oracle/php_oracle.h:1.5 php4/ext/oracle/php_oracle.h:1.6 --- php4/ext/oracle/php_oracle.h:1.5 Fri Apr 21 08:04:40 2000 +++ php4/ext/oracle/php_oracle.h Sun Jul 2 16:46:44 2000 @@ -1,9 +1,9 @@ -/* $Id: php_oracle.h,v 1.5 2000/04/21 15:04:40 thies Exp $ */ +/* $Id: php_oracle.h,v 1.6 2000/07/02 23:46:44 sas Exp $ */ /* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */ -#ifndef _PHP_ORACLE_H -#define _PHP_ORACLE_H +#ifndef PHP_ORACLE_H +#define PHP_ORACLE_H #if HAVE_ORACLE @@ -132,7 +132,7 @@ #endif /* HAVE_ORACLE */ -#endif /* _PHP_ORACLE_H */ +#endif /* PHP_ORACLE_H */ /* * Local Variables: Index: php4/ext/pcre/php_pcre.h diff -u php4/ext/pcre/php_pcre.h:1.21 php4/ext/pcre/php_pcre.h:1.22 --- php4/ext/pcre/php_pcre.h:1.21 Wed Jun 28 13:07:25 2000 +++ php4/ext/pcre/php_pcre.h Sun Jul 2 16:46:44 2000 @@ -16,10 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.h,v 1.21 2000/06/28 20:07:25 andrei Exp $ */ +/* $Id: php_pcre.h,v 1.22 2000/07/02 23:46:44 sas Exp $ */ -#ifndef _PHP_PCRE_H -#define _PHP_PCRE_H +#ifndef PHP_PCRE_H +#define PHP_PCRE_H #if HAVE_PCRE || HAVE_BUNDLED_PCRE @@ -87,4 +87,4 @@ #define phpext_pcre_ptr pcre_module_ptr -#endif /* _PHP_PCRE_H */ +#endif /* PHP_PCRE_H */ Index: php4/ext/pcre/pcrelib/pcre.h diff -u php4/ext/pcre/pcrelib/pcre.h:1.7 php4/ext/pcre/pcrelib/pcre.h:1.8 --- php4/ext/pcre/pcrelib/pcre.h:1.7 Tue Apr 11 11:40:47 2000 +++ php4/ext/pcre/pcrelib/pcre.h Sun Jul 2 16:46:45 2000 @@ -4,8 +4,8 @@ /* Copyright (c) 1997-2000 University of Cambridge */ -#ifndef _PCRE_H -#define _PCRE_H +#ifndef PCRE_H +#define PCRE_H #define PCRE_MAJOR 3 #define PCRE_MINOR 1 Index: php4/ext/pcre/pcrelib/pcreposix.h diff -u php4/ext/pcre/pcrelib/pcreposix.h:1.3 php4/ext/pcre/pcrelib/pcreposix.h:1.4 --- php4/ext/pcre/pcrelib/pcreposix.h:1.3 Tue Apr 11 11:40:47 2000 +++ php4/ext/pcre/pcrelib/pcreposix.h Sun Jul 2 16:46:45 2000 @@ -4,8 +4,8 @@ /* Copyright (c) 1997-2000 University of Cambridge */ -#ifndef _PCREPOSIX_H -#define _PCREPOSIX_H +#ifndef PCREPOSIX_H +#define PCREPOSIX_H /* This is the header for the POSIX wrapper interface to the PCRE Perl- Compatible Regular Expression library. It defines the things POSIX says should Index: php4/ext/pdf/php_pdf.h diff -u php4/ext/pdf/php_pdf.h:1.9 php4/ext/pdf/php_pdf.h:1.10 --- php4/ext/pdf/php_pdf.h:1.9 Wed Jun 7 11:06:10 2000 +++ php4/ext/pdf/php_pdf.h Sun Jul 2 16:46:45 2000 @@ -26,10 +26,10 @@ | Authors: Uwe Steinmann | +----------------------------------------------------------------------+ */ -/* $Id: php_pdf.h,v 1.9 2000/06/07 18:06:10 steinm Exp $ */ +/* $Id: php_pdf.h,v 1.10 2000/07/02 23:46:45 sas Exp $ */ -#ifndef _PHP_PDF_H -#define _PHP_PDF_H +#ifndef PHP_PDF_H +#define PHP_PDF_H #if HAVE_PDFLIB @@ -141,4 +141,4 @@ #define pdf_module_ptr NULL #endif #define phpext_pdf_ptr pdf_module_ptr -#endif /* _PHP_PDF_H */ +#endif /* PHP_PDF_H */ Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.16 php4/ext/pgsql/php_pgsql.h:1.17 --- php4/ext/pgsql/php_pgsql.h:1.16 Sun Jul 2 01:59:44 2000 +++ php4/ext/pgsql/php_pgsql.h Sun Jul 2 16:46:45 2000 @@ -17,10 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.16 2000/07/02 08:59:44 hirokawa Exp $ */ +/* $Id: php_pgsql.h,v 1.17 2000/07/02 23:46:45 sas Exp $ */ -#ifndef _PHP_PGSQL_H -#define _PHP_PGSQL_H +#ifndef PHP_PGSQL_H +#define PHP_PGSQL_H #if HAVE_PGSQL @@ -142,4 +142,4 @@ #define phpext_pgsql_ptr pgsql_module_ptr -#endif /* _PHP_PGSQL_H */ +#endif /* PHP_PGSQL_H */ Index: php4/ext/posix/php_posix.h diff -u php4/ext/posix/php_posix.h:1.4 php4/ext/posix/php_posix.h:1.5 --- php4/ext/posix/php_posix.h:1.4 Sat Jun 10 07:16:34 2000 +++ php4/ext/posix/php_posix.h Sun Jul 2 16:46:45 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_posix.h,v 1.4 2000/06/10 14:16:34 andi Exp $ */ +/* $Id: php_posix.h,v 1.5 2000/07/02 23:46:45 sas Exp $ */ -#ifndef _PHP_POSIX_H -#define _PHP_POSIX_H +#ifndef PHP_POSIX_H +#define PHP_POSIX_H #if HAVE_POSIX #ifndef DLEXPORT @@ -90,4 +90,4 @@ #define phpext_posix_ptr posix_module_ptr -#endif /* _PHP_POSIX_H */ +#endif /* PHP_POSIX_H */ Index: php4/ext/readline/php_readline.h diff -u php4/ext/readline/php_readline.h:1.6 php4/ext/readline/php_readline.h:1.7 --- php4/ext/readline/php_readline.h:1.6 Thu May 18 08:34:33 2000 +++ php4/ext/readline/php_readline.h Sun Jul 2 16:46:46 2000 @@ -16,10 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_readline.h,v 1.6 2000/05/18 15:34:33 zeev Exp $ */ +/* $Id: php_readline.h,v 1.7 2000/07/02 23:46:46 sas Exp $ */ -#ifndef _PHP_READLINE_H -#define _PHP_READLINE_H +#ifndef PHP_READLINE_H +#define PHP_READLINE_H #if HAVE_LIBREADLINE #ifdef ZTS @@ -39,5 +39,5 @@ #endif /* HAVE_LIBREADLINE */ -#endif /* _PHP_READLINE_H */ +#endif /* PHP_READLINE_H */ Index: php4/ext/recode/php_recode.h diff -u php4/ext/recode/php_recode.h:1.4 php4/ext/recode/php_recode.h:1.5 --- php4/ext/recode/php_recode.h:1.4 Sat Jun 10 01:47:58 2000 +++ php4/ext/recode/php_recode.h Sun Jul 2 16:46:46 2000 @@ -17,10 +17,10 @@ */ -/* $Id: php_recode.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_recode.h,v 1.5 2000/07/02 23:46:46 sas Exp $ */ -#ifndef _PHP_RECODE_H -#define _PHP_RECODE_H +#ifndef PHP_RECODE_H +#define PHP_RECODE_H #ifdef PHP_WIN32 #define PHP_MYSQL_API __declspec(dllexport) @@ -86,4 +86,4 @@ #define phpext_recode_ptr NULL #endif -#endif /* _PHP_RECODE_H */ +#endif /* PHP_RECODE_H */ Index: php4/ext/snmp/php_snmp.h diff -u php4/ext/snmp/php_snmp.h:1.8 php4/ext/snmp/php_snmp.h:1.9 --- php4/ext/snmp/php_snmp.h:1.8 Sat Jun 10 01:47:58 2000 +++ php4/ext/snmp/php_snmp.h Sun Jul 2 16:46:47 2000 @@ -18,9 +18,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_snmp.h,v 1.8 2000/06/10 08:47:58 andi Exp $ */ -#ifndef _PHP_SNMP_H -#define _PHP_SNMP_H +/* $Id: php_snmp.h,v 1.9 2000/07/02 23:46:47 sas Exp $ */ +#ifndef PHP_SNMP_H +#define PHP_SNMP_H #if HAVE_SNMP #ifndef DLEXPORT @@ -46,4 +46,4 @@ #define phpext_snmp_ptr snmp_module_ptr -#endif /* _PHP_SNMP_H */ +#endif /* PHP_SNMP_H */ Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.55 php4/ext/standard/basic_functions.h:1.56 --- php4/ext/standard/basic_functions.h:1.55 Fri Jun 23 09:21:31 2000 +++ php4/ext/standard/basic_functions.h Sun Jul 2 16:46:47 2000 @@ -29,10 +29,10 @@ */ -/* $Id: basic_functions.h,v 1.55 2000/06/23 16:21:31 sas Exp $ */ +/* $Id: basic_functions.h,v 1.56 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _BASIC_FUNCTIONS_H -#define _BASIC_FUNCTIONS_H +#ifndef BASIC_FUNCTIONS_H +#define BASIC_FUNCTIONS_H #include <sys/stat.h> @@ -207,4 +207,4 @@ #define SAFE_MODE_PROTECTED_ENV_VARS "LD_LIBRARY_PATH" #define SAFE_MODE_ALLOWED_ENV_VARS "PHP_" -#endif /* _BASIC_FUNCTIONS_H */ +#endif /* BASIC_FUNCTIONS_H */ Index: php4/ext/standard/cyr_convert.h diff -u php4/ext/standard/cyr_convert.h:1.2 php4/ext/standard/cyr_convert.h:1.3 --- php4/ext/standard/cyr_convert.h:1.2 Sun May 16 04:19:25 1999 +++ php4/ext/standard/cyr_convert.h Sun Jul 2 16:46:47 2000 @@ -27,14 +27,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyr_convert.h,v 1.2 1999/05/16 11:19:25 sas Exp $ */ +/* $Id: cyr_convert.h,v 1.3 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _CYR_CONVERT_H -#define _CYR_CONVERT_H +#ifndef CYR_CONVERT_H +#define CYR_CONVERT_H PHP_FUNCTION(convert_cyr_string); -#endif /* _CYR_CONVERT_H */ +#endif /* CYR_CONVERT_H */ Index: php4/ext/standard/datetime.h diff -u php4/ext/standard/datetime.h:1.6 php4/ext/standard/datetime.h:1.7 --- php4/ext/standard/datetime.h:1.6 Tue Mar 28 12:26:02 2000 +++ php4/ext/standard/datetime.h Sun Jul 2 16:46:47 2000 @@ -29,10 +29,10 @@ */ -/* $Id: datetime.h,v 1.6 2000/03/28 20:26:02 sterling Exp $ */ +/* $Id: datetime.h,v 1.7 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _DATETIME_H -#define _DATETIME_H +#ifndef DATETIME_H +#define DATETIME_H PHP_FUNCTION(time); PHP_FUNCTION(mktime); @@ -54,4 +54,4 @@ void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm); #endif -#endif /* _DATETIME_H */ +#endif /* DATETIME_H */ Index: php4/ext/standard/dl.h diff -u php4/ext/standard/dl.h:1.11 php4/ext/standard/dl.h:1.12 --- php4/ext/standard/dl.h:1.11 Sat May 27 12:27:20 2000 +++ php4/ext/standard/dl.h Sun Jul 2 16:46:47 2000 @@ -30,10 +30,10 @@ */ -/* $Id: dl.h,v 1.11 2000/05/27 19:27:20 hholzgra Exp $ */ +/* $Id: dl.h,v 1.12 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _DL_H -#define _DL_H +#ifndef DL_H +#define DL_H void php_dl(pval *file,int type,pval *return_value); @@ -43,4 +43,4 @@ PHP_MINFO_FUNCTION(dl); -#endif /* _DL_H */ +#endif /* DL_H */ Index: php4/ext/standard/dns.h diff -u php4/ext/standard/dns.h:1.4 php4/ext/standard/dns.h:1.5 --- php4/ext/standard/dns.h:1.4 Fri Feb 11 07:59:29 2000 +++ php4/ext/standard/dns.h Sun Jul 2 16:46:47 2000 @@ -29,10 +29,10 @@ */ -/* $Id: dns.h,v 1.4 2000/02/11 15:59:29 zeev Exp $ */ +/* $Id: dns.h,v 1.5 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _DNS_H -#define _DNS_H +#ifndef DNS_H +#define DNS_H PHP_FUNCTION(gethostbyaddr); PHP_FUNCTION(gethostbyname); @@ -50,4 +50,4 @@ #define INT32SZ 4 #endif -#endif /* _DNS_H */ +#endif /* DNS_H */ Index: php4/ext/standard/exec.h diff -u php4/ext/standard/exec.h:1.3 php4/ext/standard/exec.h:1.4 --- php4/ext/standard/exec.h:1.3 Fri Dec 17 20:01:14 1999 +++ php4/ext/standard/exec.h Sun Jul 2 16:46:47 2000 @@ -28,10 +28,10 @@ */ -/* $Id: exec.h,v 1.3 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: exec.h,v 1.4 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _EXEC_H -#define _EXEC_H +#ifndef EXEC_H +#define EXEC_H PHP_FUNCTION(system); PHP_FUNCTION(exec); @@ -40,4 +40,4 @@ PHP_FUNCTION(shell_exec); char *php_escape_shell_cmd(char *); -#endif /* _EXEC_H */ +#endif /* EXEC_H */ Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.23 php4/ext/standard/file.h:1.24 --- php4/ext/standard/file.h:1.23 Sun Jul 2 08:12:34 2000 +++ php4/ext/standard/file.h Sun Jul 2 16:46:47 2000 @@ -27,12 +27,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.23 2000/07/02 15:12:34 andi Exp $ */ +/* $Id: file.h,v 1.24 2000/07/02 23:46:47 sas Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ -#ifndef _FILE_H -#define _FILE_H +#ifndef FILE_H +#define FILE_H extern PHP_MINIT_FUNCTION(file); @@ -83,4 +83,4 @@ PHPAPI int php_file_le_socket(void); PHPAPI int php_file_le_uploads(void); -#endif /* _FILE_H */ +#endif /* FILE_H */ Index: php4/ext/standard/flock_compat.h diff -u php4/ext/standard/flock_compat.h:1.7 php4/ext/standard/flock_compat.h:1.8 --- php4/ext/standard/flock_compat.h:1.7 Tue Jun 6 11:30:06 2000 +++ php4/ext/standard/flock_compat.h Sun Jul 2 16:46:47 2000 @@ -1,5 +1,5 @@ -#ifndef _FLOCK_COMPAT_H -#define _FLOCK_COMPAT_H +#ifndef FLOCK_COMPAT_H +#define FLOCK_COMPAT_H #ifndef HAVE_FLOCK # define LOCK_SH 1 @@ -26,4 +26,4 @@ extern int inet_aton(const char *, struct in_addr *); #endif -#endif /* _FLOCK_COMPAT_H */ +#endif /* FLOCK_COMPAT_H */ Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.27 php4/ext/standard/fsock.h:1.28 --- php4/ext/standard/fsock.h:1.27 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/fsock.h Sun Jul 2 16:46:47 2000 @@ -27,12 +27,12 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.27 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: fsock.h,v 1.28 2000/07/02 23:46:47 sas Exp $ */ /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */ -#ifndef _FSOCK_H -#define _FSOCK_H +#ifndef FSOCK_H +#define FSOCK_H #ifdef PHP_WIN32 # ifndef WINNT @@ -119,4 +119,4 @@ #define FLS_FETCH() #endif -#endif /* _FSOCK_H */ +#endif /* FSOCK_H */ Index: php4/ext/standard/head.h diff -u php4/ext/standard/head.h:1.14 php4/ext/standard/head.h:1.15 --- php4/ext/standard/head.h:1.14 Fri Apr 28 06:03:13 2000 +++ php4/ext/standard/head.h Sun Jul 2 16:46:47 2000 @@ -26,8 +26,8 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -#ifndef _HEAD_H -#define _HEAD_H +#ifndef HEAD_H +#define HEAD_H /* Index: php4/ext/standard/html.h diff -u php4/ext/standard/html.h:1.4 php4/ext/standard/html.h:1.5 --- php4/ext/standard/html.h:1.4 Mon Feb 28 20:38:14 2000 +++ php4/ext/standard/html.h Sun Jul 2 16:46:47 2000 @@ -27,10 +27,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.h,v 1.4 2000/02/29 04:38:14 andrei Exp $ */ +/* $Id: html.h,v 1.5 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _HTML_H -#define _HTML_H +#ifndef HTML_H +#define HTML_H void register_html_constants(INIT_FUNC_ARGS); @@ -40,4 +40,4 @@ PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all); -#endif /* _HTML_H */ +#endif /* HTML_H */ Index: php4/ext/standard/info.h diff -u php4/ext/standard/info.h:1.13 php4/ext/standard/info.h:1.14 --- php4/ext/standard/info.h:1.13 Mon Jun 26 07:43:37 2000 +++ php4/ext/standard/info.h Sun Jul 2 16:46:47 2000 @@ -27,10 +27,10 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.13 2000/06/26 14:43:37 kk Exp $ */ +/* $Id: info.h,v 1.14 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _INFO_H -#define _INFO_H +#ifndef INFO_H +#define INFO_H #define PHP_ENTRY_NAME_COLOR "#CCCCFF" #define PHP_CONTENTS_COLOR "#CCCCCC" @@ -78,4 +78,4 @@ void register_phpinfo_constants(INIT_FUNC_ARGS); -#endif /* _INFO_H */ +#endif /* INFO_H */ Index: php4/ext/standard/microtime.h diff -u php4/ext/standard/microtime.h:1.4 php4/ext/standard/microtime.h:1.5 --- php4/ext/standard/microtime.h:1.4 Tue Sep 14 22:08:45 1999 +++ php4/ext/standard/microtime.h Sun Jul 2 16:46:47 2000 @@ -27,13 +27,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.h,v 1.4 1999/09/15 05:08:45 andi Exp $ */ +/* $Id: microtime.h,v 1.5 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _MICROTIME_H -#define _MICROTIME_H +#ifndef MICROTIME_H +#define MICROTIME_H PHP_FUNCTION(microtime); PHP_FUNCTION(gettimeofday); PHP_FUNCTION(getrusage); -#endif /* _MICROTIME_H */ +#endif /* MICROTIME_H */ Index: php4/ext/standard/pack.h diff -u php4/ext/standard/pack.h:1.6 php4/ext/standard/pack.h:1.7 --- php4/ext/standard/pack.h:1.6 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/pack.h Sun Jul 2 16:46:47 2000 @@ -27,13 +27,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: pack.h,v 1.6 2000/03/06 20:37:11 ssb Exp $ */ +/* $Id: pack.h,v 1.7 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _PACK_H -#define _PACK_H +#ifndef PACK_H +#define PACK_H extern PHP_MINIT_FUNCTION(pack); PHP_FUNCTION(pack); PHP_FUNCTION(unpack); -#endif /* _PACK_H */ +#endif /* PACK_H */ Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.13 php4/ext/standard/php_array.h:1.14 --- php4/ext/standard/php_array.h:1.13 Sat Jun 10 12:09:56 2000 +++ php4/ext/standard/php_array.h Sun Jul 2 16:46:47 2000 @@ -19,10 +19,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.13 2000/06/10 19:09:56 venaas Exp $ */ +/* $Id: php_array.h,v 1.14 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _PHP_ARRAY_H -#define _PHP_ARRAY_H +#ifndef PHP_ARRAY_H +#define PHP_ARRAY_H PHP_MINIT_FUNCTION(array); PHP_MSHUTDOWN_FUNCTION(array); @@ -99,4 +99,4 @@ extern php_array_globals array_globals; #endif -#endif /* _PHP_ARRAY_H */ +#endif /* PHP_ARRAY_H */ Index: php4/ext/standard/php_assert.h diff -u php4/ext/standard/php_assert.h:1.5 php4/ext/standard/php_assert.h:1.6 --- php4/ext/standard/php_assert.h:1.5 Thu May 18 08:34:35 2000 +++ php4/ext/standard/php_assert.h Sun Jul 2 16:46:47 2000 @@ -16,10 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_assert.h,v 1.5 2000/05/18 15:34:35 zeev Exp $ */ +/* $Id: php_assert.h,v 1.6 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _PHP_ASSERT_H -#define _PHP_ASSERT_H +#ifndef PHP_ASSERT_H +#define PHP_ASSERT_H PHP_MINIT_FUNCTION(assert); PHP_MSHUTDOWN_FUNCTION(assert); @@ -29,4 +29,4 @@ PHP_FUNCTION(assert); PHP_FUNCTION(assert_options); -#endif /* _PHP_ASSERT_H */ +#endif /* PHP_ASSERT_H */ Index: php4/ext/standard/php_browscap.h diff -u php4/ext/standard/php_browscap.h:1.3 php4/ext/standard/php_browscap.h:1.4 --- php4/ext/standard/php_browscap.h:1.3 Mon Mar 6 12:37:11 2000 +++ php4/ext/standard/php_browscap.h Sun Jul 2 16:46:47 2000 @@ -28,12 +28,12 @@ */ -#ifndef _PHP_BROWSCAP_H -#define _PHP_BROWSCAP_H +#ifndef PHP_BROWSCAP_H +#define PHP_BROWSCAP_H extern PHP_MINIT_FUNCTION(browscap); extern PHP_MSHUTDOWN_FUNCTION(browscap); PHP_FUNCTION(get_browser); -#endif /* _PHP_BROWSCAP_H */ +#endif /* PHP_BROWSCAP_H */ Index: php4/ext/standard/php_dir.h diff -u php4/ext/standard/php_dir.h:1.8 php4/ext/standard/php_dir.h:1.9 --- php4/ext/standard/php_dir.h:1.8 Thu Jun 29 14:51:40 2000 +++ php4/ext/standard/php_dir.h Sun Jul 2 16:46:47 2000 @@ -17,10 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dir.h,v 1.8 2000/06/29 21:51:40 zeev Exp $ */ +/* $Id: php_dir.h,v 1.9 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _PHP_DIR_H -#define _PHP_DIR_H +#ifndef PHP_DIR_H +#define PHP_DIR_H /* directory functions */ PHP_MINIT_FUNCTION(dir); @@ -33,4 +33,4 @@ PHP_FUNCTION(readdir); PHP_FUNCTION(getdir); -#endif /* _PHP_DIR_H */ +#endif /* PHP_DIR_H */ Index: php4/ext/standard/php_ext_syslog.h diff -u php4/ext/standard/php_ext_syslog.h:1.1 php4/ext/standard/php_ext_syslog.h:1.2 --- php4/ext/standard/php_ext_syslog.h:1.1 Sun May 28 09:19:45 2000 +++ php4/ext/standard/php_ext_syslog.h Sun Jul 2 16:46:47 2000 @@ -27,8 +27,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _PHP_EXT_SYSLOG_H -#define _PHP_EXT_SYSLOG_H +#ifndef PHP_EXT_SYSLOG_H +#define PHP_EXT_SYSLOG_H #ifdef HAVE_SYSLOG_H @@ -45,4 +45,4 @@ #endif -#endif /* _PHP_EXT_SYSLOG_H */ +#endif /* PHP_EXT_SYSLOG_H */ Index: php4/ext/standard/php_link.h diff -u php4/ext/standard/php_link.h:1.3 php4/ext/standard/php_link.h:1.4 --- php4/ext/standard/php_link.h:1.3 Sun Jul 2 08:12:34 2000 +++ php4/ext/standard/php_link.h Sun Jul 2 16:46:47 2000 @@ -28,9 +28,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_link.h,v 1.3 2000/07/02 15:12:34 andi Exp $ */ -#ifndef _PHP_LINK_H -#define _PHP_LINK_H +/* $Id: php_link.h,v 1.4 2000/07/02 23:46:47 sas Exp $ */ +#ifndef PHP_LINK_H +#define PHP_LINK_H #ifdef HAVE_SYMLINK @@ -41,4 +41,4 @@ #endif -#endif /* _PHP_LINK_H */ +#endif /* PHP_LINK_H */ Index: php4/ext/standard/php_rand.h diff -u php4/ext/standard/php_rand.h:1.5 php4/ext/standard/php_rand.h:1.6 --- php4/ext/standard/php_rand.h:1.5 Thu May 18 08:34:35 2000 +++ php4/ext/standard/php_rand.h Sun Jul 2 16:46:47 2000 @@ -19,10 +19,10 @@ | Based on code from: Shawn Cokus <Cokus@math.washington.edu> | +----------------------------------------------------------------------+ */ -/* $Id: php_rand.h,v 1.5 2000/05/18 15:34:35 zeev Exp $ */ +/* $Id: php_rand.h,v 1.6 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _PHP_RAND_H -#define _PHP_RAND_H +#ifndef PHP_RAND_H +#define PHP_RAND_H #include <stdlib.h> @@ -36,4 +36,4 @@ #define PHP_RAND_MAX RAND_MAX #endif -#endif /* _PHP_RAND_H */ +#endif /* PHP_RAND_H */ Index: php4/ext/standard/quot_print.h diff -u php4/ext/standard/quot_print.h:1.2 php4/ext/standard/quot_print.h:1.3 --- php4/ext/standard/quot_print.h:1.2 Sun May 16 04:19:26 1999 +++ php4/ext/standard/quot_print.h Sun Jul 2 16:46:47 2000 @@ -27,11 +27,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: quot_print.h,v 1.2 1999/05/16 11:19:26 sas Exp $ */ +/* $Id: quot_print.h,v 1.3 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _QUOT_PRINT_H -#define _QUOT_PRINT_H +#ifndef QUOT_PRINT_H +#define QUOT_PRINT_H PHP_FUNCTION(quoted_printable_decode); -#endif /* _QUOT_PRINT_H */ +#endif /* QUOT_PRINT_H */ Index: php4/ext/standard/reg.h diff -u php4/ext/standard/reg.h:1.8 php4/ext/standard/reg.h:1.9 --- php4/ext/standard/reg.h:1.8 Fri Jun 23 04:48:02 2000 +++ php4/ext/standard/reg.h Sun Jul 2 16:46:47 2000 @@ -28,10 +28,10 @@ */ -/* $Id: reg.h,v 1.8 2000/06/23 11:48:02 thies Exp $ */ +/* $Id: reg.h,v 1.9 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _REG_H -#define _REG_H +#ifndef REG_H +#define REG_H char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended); @@ -68,4 +68,4 @@ #define REGLS_FETCH() #endif -#endif /* _REG_H */ +#endif /* REG_H */ Index: php4/ext/standard/type.h diff -u php4/ext/standard/type.h:1.3 php4/ext/standard/type.h:1.4 --- php4/ext/standard/type.h:1.3 Fri Dec 17 20:01:15 1999 +++ php4/ext/standard/type.h Sun Jul 2 16:46:47 2000 @@ -26,8 +26,8 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -#ifndef _TYPE_H -#define _TYPE_H +#ifndef TYPE_H +#define TYPE_H extern int php_check_type(char *str); extern int php_check_ident_type(char *str); Index: php4/ext/standard/uniqid.h diff -u php4/ext/standard/uniqid.h:1.2 php4/ext/standard/uniqid.h:1.3 --- php4/ext/standard/uniqid.h:1.2 Sun May 16 04:19:26 1999 +++ php4/ext/standard/uniqid.h Sun Jul 2 16:46:47 2000 @@ -27,11 +27,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.h,v 1.2 1999/05/16 11:19:26 sas Exp $ */ +/* $Id: uniqid.h,v 1.3 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _UNIQID_H -#define _UNIQID_H +#ifndef UNIQID_H +#define UNIQID_H PHP_FUNCTION(uniqid); -#endif /* _UNIQID_H */ +#endif /* UNIQID_H */ Index: php4/ext/standard/url.h diff -u php4/ext/standard/url.h:1.5 php4/ext/standard/url.h:1.6 --- php4/ext/standard/url.h:1.5 Mon Mar 6 20:28:43 2000 +++ php4/ext/standard/url.h Sun Jul 2 16:46:47 2000 @@ -26,10 +26,10 @@ | Authors: Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: url.h,v 1.5 2000/03/07 04:28:43 andrei Exp $ */ +/* $Id: url.h,v 1.6 2000/07/02 23:46:47 sas Exp $ */ -#ifndef _URL_H -#define _URL_H +#ifndef URL_H +#define URL_H typedef struct url { char *scheme; @@ -55,7 +55,7 @@ PHP_FUNCTION(rawurlencode); PHP_FUNCTION(rawurldecode); -#endif /* _URL_H */ +#endif /* URL_H */ /* * Local variables: Index: php4/ext/swf/php_swf.h diff -u php4/ext/swf/php_swf.h:1.7 php4/ext/swf/php_swf.h:1.8 --- php4/ext/swf/php_swf.h:1.7 Sat Jun 10 01:47:58 2000 +++ php4/ext/swf/php_swf.h Sun Jul 2 16:46:48 2000 @@ -16,10 +16,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_swf.h,v 1.7 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_swf.h,v 1.8 2000/07/02 23:46:48 sas Exp $ */ -#ifndef _PHP_SWF_H -#define _PHP_SWF_H +#ifndef PHP_SWF_H +#define PHP_SWF_H #if HAVE_SWF Index: php4/ext/sybase_ct/php_sybase_ct.h diff -u php4/ext/sybase_ct/php_sybase_ct.h:1.4 php4/ext/sybase_ct/php_sybase_ct.h:1.5 --- php4/ext/sybase_ct/php_sybase_ct.h:1.4 Sat Jun 10 01:47:58 2000 +++ php4/ext/sybase_ct/php_sybase_ct.h Sun Jul 2 16:46:48 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_sybase_ct.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_sybase_ct.h,v 1.5 2000/07/02 23:46:48 sas Exp $ */ -#ifndef _PHP_SYBASE_CT_H -#define _PHP_SYBASE_CT_H +#ifndef PHP_SYBASE_CT_H +#define PHP_SYBASE_CT_H #if HAVE_SYBASE_CT @@ -116,4 +116,4 @@ #define phpext_sybase_ct_ptr sybase_module_ptr -#endif /* _PHP_SYBASE_CT_H */ +#endif /* PHP_SYBASE_CT_H */ Index: php4/ext/sysvsem/php_sysvsem.h diff -u php4/ext/sysvsem/php_sysvsem.h:1.5 php4/ext/sysvsem/php_sysvsem.h:1.6 --- php4/ext/sysvsem/php_sysvsem.h:1.5 Sat Jun 10 01:47:58 2000 +++ php4/ext/sysvsem/php_sysvsem.h Sun Jul 2 16:46:48 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_sysvsem.h,v 1.5 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_sysvsem.h,v 1.6 2000/07/02 23:46:48 sas Exp $ */ -#ifndef _PHP_SYSVSEM_H -#define _PHP_SYSVSEM_H +#ifndef PHP_SYSVSEM_H +#define PHP_SYSVSEM_H #if HAVE_SYSVSEM @@ -64,4 +64,4 @@ #define phpext_sysvsem_ptr sysvsem_module_ptr -#endif /* _PHP_SYSVSEM_H */ +#endif /* PHP_SYSVSEM_H */ Index: php4/ext/sysvshm/php_sysvshm.h diff -u php4/ext/sysvshm/php_sysvshm.h:1.4 php4/ext/sysvshm/php_sysvshm.h:1.5 --- php4/ext/sysvshm/php_sysvshm.h:1.4 Sat Jun 10 01:47:58 2000 +++ php4/ext/sysvshm/php_sysvshm.h Sun Jul 2 16:46:49 2000 @@ -28,10 +28,10 @@ */ -/* $Id: php_sysvshm.h,v 1.4 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_sysvshm.h,v 1.5 2000/07/02 23:46:49 sas Exp $ */ -#ifndef _PHP_SYSVSHM_H -#define _PHP_SYSVSHM_H +#ifndef PHP_SYSVSHM_H +#define PHP_SYSVSHM_H #if HAVE_SYSVSHM @@ -94,4 +94,4 @@ #define phpext_sysvshm_ptr sysvshm_module_ptr -#endif /* _PHP_SYSVSHM_H */ +#endif /* PHP_SYSVSHM_H */ Index: php4/ext/xml/php_xml.h diff -u php4/ext/xml/php_xml.h:1.11 php4/ext/xml/php_xml.h:1.12 --- php4/ext/xml/php_xml.h:1.11 Thu May 18 08:34:38 2000 +++ php4/ext/xml/php_xml.h Sun Jul 2 16:46:49 2000 @@ -17,10 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xml.h,v 1.11 2000/05/18 15:34:38 zeev Exp $ */ +/* $Id: php_xml.h,v 1.12 2000/07/02 23:46:49 sas Exp $ */ -#ifndef _PHP_XML_H -#define _PHP_XML_H +#ifndef PHP_XML_H +#define PHP_XML_H #ifdef HAVE_LIBEXPAT @@ -151,7 +151,7 @@ #define XMLLS_FETCH() #endif -#endif /* _PHP_XML_H */ +#endif /* PHP_XML_H */ /* * Local variables: Index: php4/ext/yp/php_yp.h diff -u php4/ext/yp/php_yp.h:1.5 php4/ext/yp/php_yp.h:1.6 --- php4/ext/yp/php_yp.h:1.5 Sat Jun 10 01:47:58 2000 +++ php4/ext/yp/php_yp.h Sun Jul 2 16:46:49 2000 @@ -26,10 +26,10 @@ | Authors: Stephanie Wehner <_@r4k.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_yp.h,v 1.5 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_yp.h,v 1.6 2000/07/02 23:46:49 sas Exp $ */ -#ifndef _PHP_YP_H -#define _PHP_YP_H +#ifndef PHP_YP_H +#define PHP_YP_H #if HAVE_YP @@ -53,4 +53,4 @@ #define phpext_yp_ptr yp_module_ptr -#endif /* _PHP_YP_H */ +#endif /* PHP_YP_H */ Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.6 php4/ext/zlib/php_zlib.h:1.7 --- php4/ext/zlib/php_zlib.h:1.6 Sat Jun 10 01:47:58 2000 +++ php4/ext/zlib/php_zlib.h Sun Jul 2 16:46:50 2000 @@ -23,10 +23,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.6 2000/06/10 08:47:58 andi Exp $ */ +/* $Id: php_zlib.h,v 1.7 2000/07/02 23:46:50 sas Exp $ */ -#ifndef _PHP_ZLIB_H -#define _PHP_ZLIB_H +#ifndef PHP_ZLIB_H +#define PHP_ZLIB_H #if HAVE_ZLIB @@ -73,4 +73,4 @@ #define phpext_zlib_ptr zlib_module_ptr -#endif /* _PHP_ZLIB_H */ +#endif /* PHP_ZLIB_H */ Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.48 php4/main/SAPI.h:1.49 --- php4/main/SAPI.h:1.48 Mon Jun 26 11:05:49 2000 +++ php4/main/SAPI.h Sun Jul 2 16:46:50 2000 @@ -17,8 +17,8 @@ */ -#ifndef _NEW_SAPI_H -#define _NEW_SAPI_H +#ifndef SAPI_H +#define SAPI_H #include "zend.h" #include "zend_llist.h" @@ -208,7 +208,7 @@ #define STANDARD_SAPI_MODULE_PROPERTIES NULL -#endif /* _NEW_SAPI_H */ +#endif /* SAPI_H */ /* * Local variables: Index: php4/main/internal_functions_registry.h diff -u php4/main/internal_functions_registry.h:1.9 php4/main/internal_functions_registry.h:1.10 --- php4/main/internal_functions_registry.h:1.9 Thu May 18 08:34:21 2000 +++ php4/main/internal_functions_registry.h Sun Jul 2 16:46:50 2000 @@ -18,10 +18,10 @@ */ -/* $Id: internal_functions_registry.h,v 1.9 2000/05/18 15:34:21 zeev Exp $ */ +/* $Id: internal_functions_registry.h,v 1.10 2000/07/02 23:46:50 sas Exp $ */ -#ifndef _INTERNAL_FUNCTIONS_REGISTRY_H -#define _INTERNAL_FUNCTIONS_REGISTRY_H +#ifndef INTERNAL_FUNCTIONS_REGISTRY_H +#define INTERNAL_FUNCTIONS_REGISTRY_H extern int php_init_mime(INIT_FUNC_ARGS); Index: php4/main/php.h diff -u php4/main/php.h:1.106 php4/main/php.h:1.107 --- php4/main/php.h:1.106 Sat Jun 24 09:10:18 2000 +++ php4/main/php.h Sun Jul 2 16:46:50 2000 @@ -17,10 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.106 2000/06/24 16:10:18 andi Exp $ */ +/* $Id: php.h,v 1.107 2000/07/02 23:46:50 sas Exp $ */ -#ifndef _PHP_H -#define _PHP_H +#ifndef PHP_H +#define PHP_H #ifdef HAVE_DMALLOC #include <dmalloc.h> Index: php4/main/php_content_types.h diff -u php4/main/php_content_types.h:1.4 php4/main/php_content_types.h:1.5 --- php4/main/php_content_types.h:1.4 Thu Feb 17 12:23:57 2000 +++ php4/main/php_content_types.h Sun Jul 2 16:46:50 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_CONTENT_TYPES_H -#define _PHP_CONTENT_TYPES_H +#ifndef PHP_CONTENT_TYPES_H +#define PHP_CONTENT_TYPES_H #define DEFAULT_POST_CONTENT_TYPE "application/x-www-form-urlencoded" @@ -7,4 +7,4 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler); int php_startup_sapi_content_types(void); -#endif /* _PHP_CONTENT_TYPES_H */ +#endif /* PHP_CONTENT_TYPES_H */ Index: php4/main/php_globals.h diff -u php4/main/php_globals.h:1.51 php4/main/php_globals.h:1.52 --- php4/main/php_globals.h:1.51 Thu Jun 15 19:27:47 2000 +++ php4/main/php_globals.h Sun Jul 2 16:46:50 2000 @@ -17,8 +17,8 @@ */ -#ifndef _PHP_GLOBALS_H -#define _PHP_GLOBALS_H +#ifndef PHP_GLOBALS_H +#define PHP_GLOBALS_H #include "zend_globals.h" @@ -115,7 +115,7 @@ }; -#endif /* _PHP_GLOBALS_H */ +#endif /* PHP_GLOBALS_H */ /* * Local variables: Index: php4/main/php_ini.h diff -u php4/main/php_ini.h:1.23 php4/main/php_ini.h:1.24 --- php4/main/php_ini.h:1.23 Fri Jun 2 20:05:28 2000 +++ php4/main/php_ini.h Sun Jul 2 16:46:50 2000 @@ -16,8 +16,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _PHP_INI_H -#define _PHP_INI_H +#ifndef PHP_INI_H +#define PHP_INI_H #define PHP_INI_USER (1<<0) #define PHP_INI_PERDIR (1<<1) @@ -155,4 +155,4 @@ #define PHP_INI_STAGE_DEACTIVATE (1<<3) #define PHP_INI_STAGE_RUNTIME (1<<4) -#endif /* _PHP_INI_H */ +#endif /* PHP_INI_H */ Index: php4/main/php_realpath.h diff -u php4/main/php_realpath.h:1.5 php4/main/php_realpath.h:1.6 --- php4/main/php_realpath.h:1.5 Thu May 18 08:34:21 2000 +++ php4/main/php_realpath.h Sun Jul 2 16:46:50 2000 @@ -16,8 +16,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _PHP_REALPATH_H_ -#define _PHP_REALPATH_H_ +#ifndef PHP_REALPATH_H +#define PHP_REALPATH_H extern char *php_realpath(const char *path, char resolved_path []); Index: php4/main/php_regex.h diff -u php4/main/php_regex.h:1.10 php4/main/php_regex.h:1.11 --- php4/main/php_regex.h:1.10 Thu Feb 10 11:41:18 2000 +++ php4/main/php_regex.h Sun Jul 2 16:46:50 2000 @@ -1,5 +1,5 @@ -#ifndef _PHP_REGEX_H -#define _PHP_REGEX_H +#ifndef PHP_REGEX_H +#define PHP_REGEX_H /* * REGEX means: @@ -39,4 +39,4 @@ #endif #endif -#endif /* _PHP_REGEX_H */ +#endif /* PHP_REGEX_H */ Index: php4/main/php_ticks.h diff -u php4/main/php_ticks.h:1.1 php4/main/php_ticks.h:1.2 --- php4/main/php_ticks.h:1.1 Fri Feb 25 13:27:02 2000 +++ php4/main/php_ticks.h Sun Jul 2 16:46:50 2000 @@ -17,8 +17,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _PHP_TICKS_H -#define _PHP_TICKS_H +#ifndef PHP_TICKS_H +#define PHP_TICKS_H struct _php_tick_function_entry { void (*func)(int count); Index: php4/main/php_variables.h diff -u php4/main/php_variables.h:1.4 php4/main/php_variables.h:1.5 --- php4/main/php_variables.h:1.4 Sat Feb 19 12:12:26 2000 +++ php4/main/php_variables.h Sun Jul 2 16:46:50 2000 @@ -27,10 +27,10 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_variables.h,v 1.4 2000/02/19 20:12:26 zeev Exp $ */ +/* $Id: php_variables.h,v 1.5 2000/07/02 23:46:50 sas Exp $ */ -#ifndef _PHP_VARIABLES_H -#define _PHP_VARIABLES_H +#ifndef PHP_VARIABLES_H +#define PHP_VARIABLES_H #include "php.h" #include "SAPI.h" @@ -46,4 +46,4 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array ELS_DC PLS_DC); -#endif /* _PHP_VARIABLES_H */ +#endif /* PHP_VARIABLES_H */ Index: php4/main/rfc1867.h diff -u php4/main/rfc1867.h:1.3 php4/main/rfc1867.h:1.4 --- php4/main/rfc1867.h:1.3 Thu Feb 17 12:23:57 2000 +++ php4/main/rfc1867.h Sun Jul 2 16:46:50 2000 @@ -1,5 +1,5 @@ -#ifndef _RFC1867_H -#define _RFC1867_H +#ifndef RFC1867_H +#define RFC1867_H #include "SAPI.h" @@ -10,4 +10,4 @@ #define FILE_UPLOAD_INPUT_BUFFER_SIZE 8192 -#endif /* _RFC1867_H */ +#endif /* RFC1867_H */ Index: php4/main/safe_mode.h diff -u php4/main/safe_mode.h:1.3 php4/main/safe_mode.h:1.4 --- php4/main/safe_mode.h:1.3 Sun Jun 25 10:02:46 2000 +++ php4/main/safe_mode.h Sun Jul 2 16:46:50 2000 @@ -1,5 +1,5 @@ -#ifndef _SAFE_MODE_H_ -#define _SAFE_MODE_H_ +#ifndef SAFE_MODE_H +#define SAFE_MODE_H extern PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode); extern PHPAPI char *php_get_current_user(void); Index: php4/main/snprintf.h diff -u php4/main/snprintf.h:1.8 php4/main/snprintf.h:1.9 --- php4/main/snprintf.h:1.8 Thu May 18 08:34:21 2000 +++ php4/main/snprintf.h Sun Jul 2 16:46:50 2000 @@ -16,8 +16,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _PHP_SNPRINTF_H -#define _PHP_SNPRINTF_H +#ifndef SNPRINTF_H +#define SNPRINTF_H #ifndef HAVE_SNPRINTF extern int ap_php_snprintf(char *, size_t, const char *, ...); @@ -34,7 +34,7 @@ #define sprintf php_sprintf #endif -#endif /* _PHP_SNPRINTF_H */ +#endif /* SNPRINTF_H */ /* * Local variables: Index: php4/sapi/apache/mod_php4.h diff -u php4/sapi/apache/mod_php4.h:1.6 php4/sapi/apache/mod_php4.h:1.7 --- php4/sapi/apache/mod_php4.h:1.6 Thu May 18 08:34:40 2000 +++ php4/sapi/apache/mod_php4.h Sun Jul 2 16:46:50 2000 @@ -15,10 +15,10 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.h,v 1.6 2000/05/18 15:34:40 zeev Exp $ */ +/* $Id: mod_php4.h,v 1.7 2000/07/02 23:46:50 sas Exp $ */ -#ifndef _MOD_PHP4_H -#define _MOD_PHP4_H +#ifndef MOD_PHP4_H +#define MOD_PHP4_H #if !defined(WIN32) && !defined(WINNT) #ifndef MODULE_VAR_EXPORT @@ -40,7 +40,7 @@ #define S_IXUSR _S_IEXEC #endif -#endif /* _MOD_PHP4_H */ +#endif /* MOD_PHP4_H */ /* * Local variables: Index: php4/win32/php_registry.h diff -u php4/win32/php_registry.h:1.1 php4/win32/php_registry.h:1.2 --- php4/win32/php_registry.h:1.1 Sun Apr 18 08:54:18 1999 +++ php4/win32/php_registry.h Sun Jul 2 16:46:51 2000 @@ -1,7 +1,7 @@ -#ifndef _PHP_REGISTRY_H -#define _PHP_REGISTRY_H +#ifndef PHP_REGISTRY_H +#define PHP_REGISTRY_H void UpdateIniFromRegistry(char *path); -#endif /* _PHP_REGISTRY_H */ \ No newline at end of file +#endif /* PHP_REGISTRY_H */ Index: php4/win32/pwd.h diff -u php4/win32/pwd.h:1.1.1.1 php4/win32/pwd.h:1.2 --- php4/win32/pwd.h:1.1.1.1 Wed Apr 7 14:05:12 1999 +++ php4/win32/pwd.h Sun Jul 2 16:46:51 2000 @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Header: /local/repository/php4/win32/pwd.h,v 1.1.1.1 1999/04/07 21:05:12 zeev Exp $ + $Header: /local/repository/php4/win32/pwd.h,v 1.2 2000/07/02 23:46:51 sas Exp $ */ /* This 'implementation' is conjectured from the use of this functions in @@ -26,8 +26,8 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> */ -#ifndef _PWD_H_ -#define _PWD_H_ +#ifndef PWD_H +#define PWD_H #if 0 /* This is taken care of in Windows-NT/config.h. */ typedef int uid_t; Index: php4/win32/readdir.h diff -u php4/win32/readdir.h:1.4 php4/win32/readdir.h:1.5 --- php4/win32/readdir.h:1.4 Sun Jun 4 15:00:17 2000 +++ php4/win32/readdir.h Sun Jul 2 16:46:51 2000 @@ -1,5 +1,5 @@ -#ifndef _READDIR_H -#define _READDIR_H +#ifndef READDIR_H +#define READDIR_H /* @@ -41,4 +41,4 @@ void rewinddir(DIR *); -#endif /* _READDIR_H */ \ No newline at end of file +#endif /* READDIR_H */ Index: php4/win32/time.h diff -u php4/win32/time.h:1.4 php4/win32/time.h:1.5 --- php4/win32/time.h:1.4 Fri Jun 30 06:23:08 2000 +++ php4/win32/time.h Sun Jul 2 16:46:51 2000 @@ -9,8 +9,8 @@ * Modified by Shane Caraveo for PHP * *****************************************************************************/ -#ifndef _DH_TIME_H -#define _DH_TIME_H +#ifndef TIME_H +#define TIME_H /* Include stuff ************************************************************ */ #include <winsock.h> @@ -40,4 +40,4 @@ extern int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue); -#endif \ No newline at end of file +#endif