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.

diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index 1a506481eac9e1a15da1840df69b3a17d3cd8140..8b0feb739cd8e23c189bd903bcf4ca9673541c83 100644 (file)
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_BCMATH_H
-#define _PHP_BCMATH_H
+#ifndef PHP_BCMATH_H
+#define PHP_BCMATH_H
 
 #if WITH_BCMATH
 
@@ -56,4 +56,4 @@ PHP_FUNCTION(bcscale);
 
 #endif
 
-#endif /* _PHP_BCMATH_H */
+#endif /* PHP_BCMATH_H */

diff --git a/ext/calendar/sdncal.h b/ext/calendar/sdncal.h
index f652778836dbeee18c9b7da078e926d8f46e5c4f..6621d136823812504d3afb825c9e24236d2d76f8 100644 (file)
--- a/ext/calendar/sdncal.h
+++ b/ext/calendar/sdncal.h
@@ -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 @@ int DayOfWeek(long int sdn);
 extern char *DayNameShort[7];
 extern char *DayNameLong[7];
 
-#endif                                                 /* _INCLUDED_SDNCAL_H */
+#endif                                                 /* SDNCAL_H */

diff --git a/ext/com/php_COM.h b/ext/com/php_COM.h
index 64d9c16548763f79cc8b5bbf66d740e1591b3f42..addb22e7a366007a66d7def7ba2aef9994d54571 100644 (file)
--- a/ext/com/php_COM.h
+++ b/ext/com/php_COM.h
@@ -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 @@ extern zend_module_entry COM_module_entry;
 
 #define phpext_COM_ptr COM_module_ptr
 
-#endif  /* _PHP_COM_H */
+#endif  /* PHP_COM_H */

diff --git a/ext/cpdf/php_cpdf.h b/ext/cpdf/php_cpdf.h
index cf7cd7dc7a9ae014d91b355364f3baaf9e3f8e8a..9c44e513ad8e6b8e470ef67c831def3b626ab1e3 100644 (file)
--- a/ext/cpdf/php_cpdf.h
+++ b/ext/cpdf/php_cpdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_CPDF_H
-#define _PHP_CPDF_H
+#ifndef PHP_CPDF_H
+#define PHP_CPDF_H
 
 #if HAVE_CPDFLIB
 

diff --git a/ext/cybercash/cybercash.h b/ext/cybercash/cybercash.h
index 24e52ba481166aaff392149d5e4e27eaa474821c..c910e846f4004d1c6928401a4fb810b282f286e5 100644 (file)
--- a/ext/cybercash/cybercash.h
+++ b/ext/cybercash/cybercash.h
@@ -27,8 +27,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _CYBERCASH_H
-#define _CYBERCASH_H
+#ifndef CYBERCASH_H
+#define CYBERCASH_H
 
 
 #if HAVE_MCK

diff --git a/ext/dav/php_dav.h b/ext/dav/php_dav.h
index 3b0fbed2fb04faa617186172cae4a1025b5ab620..68468ac395c0671e41c6248e3828831c9445a49c 100644 (file)
--- a/ext/dav/php_dav.h
+++ b/ext/dav/php_dav.h
@@ -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 @@ typedef struct {
 } 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 */
 
 
 /*

diff --git a/ext/db/php_db.h b/ext/db/php_db.h
index d65a94e04d7001457a6c85df815dcf0498a239e2..17e396f931d9c182a3c945f5c7c63ba261f55f79 100644 (file)
--- a/ext/db/php_db.h
+++ b/ext/db/php_db.h
@@ -31,8 +31,8 @@
 /* $Id$ */
 
 
-#ifndef _PHP_DB_H
-#define _PHP_DB_H
+#ifndef PHP_DB_H
+#define PHP_DB_H
 
 
 #ifndef DLEXPORT
@@ -89,4 +89,4 @@ PHP_FUNCTION(dbmdelete);
 PHP_FUNCTION(dbmfirstkey);
 PHP_FUNCTION(dbmnextkey);
 
-#endif /* _PHP_DB_H */
+#endif /* PHP_DB_H */

diff --git a/ext/dba/php_cdb.h b/ext/dba/php_cdb.h
index 55740389915373e19661b2a206dd1e3cca33b7c2..a046f0796b3782acb5d293a7196a80341837eee5 100644 (file)
--- a/ext/dba/php_cdb.h
+++ b/ext/dba/php_cdb.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_CDB_H
-#define _PHP_CDB_H
+#ifndef PHP_CDB_H
+#define PHP_CDB_H
 
 #if DBA_CDB
 

diff --git a/ext/dba/php_db2.h b/ext/dba/php_db2.h
index d88582f1eb78d888f7f56a6d1c74ef3b4ced74ed..2a95223a85442e7141895eba131efae893289b99 100644 (file)
--- a/ext/dba/php_db2.h
+++ b/ext/dba/php_db2.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_DB2_H
-#define _PHP_DB2_H
+#ifndef PHP_DB2_H
+#define PHP_DB2_H
 
 #if DBA_DB2
 

diff --git a/ext/dba/php_db3.h b/ext/dba/php_db3.h
index 126afe98a64faab6c4cc7c87555032f774e14f66..58bb0b62a08f723baaf4d90e5dc0eb6adc49cf47 100644 (file)
--- a/ext/dba/php_db3.h
+++ b/ext/dba/php_db3.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_DB3_H
-#define _PHP_DB3_H
+#ifndef PHP_DB3_H
+#define PHP_DB3_H
 
 #if DBA_DB3
 

diff --git a/ext/dba/php_dbm.h b/ext/dba/php_dbm.h
index e99b8cc3a029bee9b3b66cea15febcca7c6fd7eb..4c963d18ed91fc48148c4f0b02c5000cf973aedd 100644 (file)
--- a/ext/dba/php_dbm.h
+++ b/ext/dba/php_dbm.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_DBM_H
-#define _PHP_DBM_H
+#ifndef PHP_DBM_H
+#define PHP_DBM_H
 
 #if DBA_DBM
 

diff --git a/ext/dba/php_gdbm.h b/ext/dba/php_gdbm.h
index 0ee6e612e7478b0e83d17cadd46cadaa43caf593..3068404cfe265943f023c47562c05dbc64bdd9e7 100644 (file)
--- a/ext/dba/php_gdbm.h
+++ b/ext/dba/php_gdbm.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_GDBM_H
-#define _PHP_GDBM_H
+#ifndef PHP_GDBM_H
+#define PHP_GDBM_H
 
 #if DBA_GDBM
 

diff --git a/ext/dba/php_ndbm.h b/ext/dba/php_ndbm.h
index 798916b6c7597c4018dcd7f889e10bf9be8c374c..b1ebf15af32d74307ab8a8f943919e5bd3741b17 100644 (file)
--- a/ext/dba/php_ndbm.h
+++ b/ext/dba/php_ndbm.h
@@ -1,5 +1,5 @@
-#ifndef _PHP_NDBM_H
-#define _PHP_NDBM_H
+#ifndef PHP_NDBM_H
+#define PHP_NDBM_H
 
 #if DBA_NDBM
 

diff --git a/ext/dbase/dbf.h b/ext/dbase/dbf.h
index 08bc70dd41870a9efff893f41c427da5526c44ce..c7ee8fde714e3df21f664589bd7a42e14e0d544a 100644 (file)
--- a/ext/dbase/dbf.h
+++ b/ext/dbase/dbf.h
@@ -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 @@ typedef struct db_head        dbhead_t;
 #include "dbf_misc.h"
 #include "dbf_rec.h"
 
-#endif /* _DBF_H_ */
+#endif /* DBF_H_ */

diff --git a/ext/dbase/dbf_ndx.h b/ext/dbase/dbf_ndx.h
index 3faff04025835617a1ab7485d45a387cc4adc18a..4bc3d29641f36078cafd1379acd575409bb28c8a 100644 (file)
--- a/ext/dbase/dbf_ndx.h
+++ b/ext/dbase/dbf_ndx.h
@@ -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_header_t *ndx_get_header(int);
 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_ */

diff --git a/ext/domxml/php_domxml.h b/ext/domxml/php_domxml.h
index 5f8201abde4c587784695f60be364af155f64d0a..3b6f1b7b94a1f0c90872807b5634c0000f8e9b9a 100644 (file)
--- a/ext/domxml/php_domxml.h
+++ b/ext/domxml/php_domxml.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_DOMXML_H
-#define _PHP_DOMXML_H
+#ifndef PHP_DOMXML_H
+#define PHP_DOMXML_H
 
 #if HAVE_DOMXML
 #include <libxml/parser.h>

diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h
index 57c403eb094020e7766b14bd7832db6ea2b279e2..812717e1aea4e803478883fc0010c7a70fbb1000 100644 (file)
--- a/ext/ereg/php_ereg.h
+++ b/ext/ereg/php_ereg.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ PHP_MINFO_FUNCTION(regex);
 #define REGLS_FETCH()
 #endif
 
-#endif /* _REG_H */
+#endif /* REG_H */

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index f4dc865163bfbd3fa38297531d3cf4c877325701..c418c1f57683823b8e7db9bc49f61b811f8e4baf 100644 (file)
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -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 */

diff --git a/ext/fdf/php_fdf.h b/ext/fdf/php_fdf.h
index cef900dc016260b19769acea87158ed5da6b4a85..c02cc4c247bf0d20e9f24d68d6b4a791c6fe91ff 100644 (file)
--- a/ext/fdf/php_fdf.h
+++ b/ext/fdf/php_fdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#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 @@ PHP_FUNCTION(fdf_add_template);
 #else
 #define phpext_fdf_ptr NULL
 #endif
-#endif /* _PHP_FDF_H */
+#endif /* PHP_FDF_H */

diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
index 84298d4ded6a22cacaa46220b175d5fe26219749..ea9a25d047f5dcb7341ac6fc81222d201249a09e 100644 (file)
--- a/ext/ftp/ftp.h
+++ b/ext/ftp/ftp.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef        _FTP_H
-#define        _FTP_H
+#ifndef        FTP_H
+#define        FTP_H
 
 #include <stdio.h>
 #ifdef HAVE_NETINET_IN_H

diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index 3424992d3725c9cde61b86c82952ab90f11d9c9d..19d1b8de764c0a382c4361845e2caf05ad1008ac 100644 (file)
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_GD_H
-#define _PHP_GD_H
+#ifndef PHP_GD_H
+#define PHP_GD_H
 
 #define HAVE_GDIMAGECREATEFROMPNG 1
 
@@ -159,4 +159,4 @@ static void _php_image_output_wbmp(gdImagePtr im, FILE *fp);
 
 #endif
 
-#endif /* _PHP_GD_H */
+#endif /* PHP_GD_H */

diff --git a/ext/hyperwave/debug.h b/ext/hyperwave/debug.h
index 7b6756a5ab561db7957809716eb69ccadcd33f1b..b596cbf522cf5fec1415883ff88bb09466fb4bf7 100644 (file)
--- a/ext/hyperwave/debug.h
+++ b/ext/hyperwave/debug.h
@@ -17,6 +17,9 @@
 * -----------------
 *
 * $Log$
+* Revision 1.1  1999/04/21 23:37:47  ssb
+* moved db
+*
 * Revision 1.1.1.1  1999/04/07 21:03:29  zeev
 * PHP 4.0
 *
@@ -49,8 +52,8 @@
 *
 ****************************************************************************/
 
-#ifndef  __DEBUG_H
-#define  __DEBUG_H
+#ifndef  DEBUG_H
+#define  DEBUG_H
 
 #ifdef  DEBUG
 #    define D(x) x
@@ -191,4 +194,4 @@ typedef  int        bool;
 #define  NO      0
 #define  YES      1
 
-#endif  __DEBUG_H
+#endif  /* DEBUG_H */

diff --git a/ext/hyperwave/hg_comm.h b/ext/hyperwave/hg_comm.h
index 922740a71927d3e3ac9be968f8a5b3e40fd2d477..31251145cbf26a8fd259bfed8f39d242f7a6d632 100644 (file)
--- a/ext/hyperwave/hg_comm.h
+++ b/ext/hyperwave/hg_comm.h
@@ -25,8 +25,8 @@
 
 /* $Id$ */
 
-#ifndef _HG_COMM_H
-#define _HG_COMM_H
+#ifndef HG_COMM_H
+#define HG_COMM_H
 
 #if HYPERWAVE
 

diff --git a/ext/hyperwave/hw_error.h b/ext/hyperwave/hw_error.h
index 6c782a12f565b10bfc30022caa4a479bbb6eeeca..876bc8f86916b8286b450ffb20621231b4b95112 100644 (file)
--- a/ext/hyperwave/hw_error.h
+++ b/ext/hyperwave/hw_error.h
@@ -24,8 +24,8 @@
 
 
 /* $Id$ */
-#ifndef _HW_ERROR_H
-#define _HW_ERROR_H
+#ifndef HW_ERROR_H
+#define HW_ERROR_H
 
 #if HYPERWAVE
 

diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index 21afab7a4d742aa1e2ee6850a9ba04f27fcb2a05..760e63b62319b9a07dd73ddd00e59ea09c49a583 100644 (file)
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#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 @@ ZEND_END_MODULE_GLOBALS(ldap)
 
 #define phpext_ldap_ptr ldap_module_ptr
 
-#endif /* _PHP_LDAP_H */
+#endif /* PHP_LDAP_H */

diff --git a/ext/msql/php_msql.h b/ext/msql/php_msql.h
index dd115727b8b6540a95bb476ac72288a6a2867fb9..8f2e436d5fea562b3f9948b0f96c87b8423cce3b 100644 (file)
--- a/ext/msql/php_msql.h
+++ b/ext/msql/php_msql.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_MSQL_H
-#define _PHP_MSQL_H
+#ifndef PHP_MSQL_H
+#define PHP_MSQL_H
 
 #if HAVE_MSQL
 
@@ -91,4 +91,4 @@ typedef struct {
 
 #define phpext_msql_ptr msql_module_ptr
 
-#endif /* _PHP_MSQL_H */
+#endif /* PHP_MSQL_H */

diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index 55ef9240de027de27c8359c270e9b3647327e546..46db2d9845e7d1c7113cc1771e2a916877857a44 100644 (file)
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_MSSQL_H
-#define _PHP_MSSQL_H
+#ifndef PHP_MSSQL_H
+#define PHP_MSSQL_H
 
 
 #if HAVE_MSSQL
@@ -154,4 +154,4 @@ extern PHP_MSSQL_API php_mssql_globals mssql_globals;
 
 #define phpext_mssql_ptr mssql_module_ptr
 
-#endif /* _PHP_MSSQL_H */
+#endif /* PHP_MSSQL_H */

diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index 42de8debb847522807fcef7240986c8f56594787..be3a88b25bc51e1193edf56c722db18e6695044e 100644 (file)
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#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 @@ ZEND_END_MODULE_GLOBALS(mysql)
 
 #define phpext_mysql_ptr mysql_module_ptr
 
-#endif /* _PHP_MYSQL_H */
+#endif /* PHP_MYSQL_H */

diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 5d889da993e2d0db3aa80c25ad4df64f99627a13..a1dfbfbb8dad0f42b4ba1221e6cf5e8ba44e9e72 100644 (file)
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -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))

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index ad87e3c410ffd1cea32d2cbc1416daf49f91edad..e3bd5f6b3acec6246d0dc3eb1698eaec3e961111 100644 (file)
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ extern ZEND_API php_odbc_globals odbc_globals;
 
 #define phpext_odbc_ptr odbc_module_ptr
 
-#endif /* _PHP_ODBC_H */
+#endif /* PHP_ODBC_H */
 
 /*
  * Local variables:

diff --git a/ext/odbc/php_velocis.h b/ext/odbc/php_velocis.h
index cfcd92af62bed69df7a23244ddd85e17b46ab9c7..8456a4168ec5441aaaced3d7813b13d42a96a99a 100644 (file)
--- a/ext/odbc/php_velocis.h
+++ b/ext/odbc/php_velocis.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ extern velocis_module php_velocis_module;
 #define velocis_module_ptr NULL
 
 #endif /* HAVE_VELOCIS */
-#endif /* _PHP_VELOCIS_H */
+#endif /* PHP_VELOCIS_H */
 
 /*
  * Local variables:

diff --git a/ext/oracle/php_oracle.h b/ext/oracle/php_oracle.h
index 4e183d20085adac86b8486ce9f83567a8fe46f99..8f4b3b38f4851a8c9996b23fcea8a63cd7b8022b 100644 (file)
--- a/ext/oracle/php_oracle.h
+++ b/ext/oracle/php_oracle.h
@@ -2,8 +2,8 @@
 
 /* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */
 
-#ifndef _PHP_ORACLE_H
-#define _PHP_ORACLE_H
+#ifndef PHP_ORACLE_H
+#define PHP_ORACLE_H
 
 #if HAVE_ORACLE
 
@@ -132,7 +132,7 @@ typedef struct {
 
 #endif /* HAVE_ORACLE */
 
-#endif /* _PHP_ORACLE_H */
+#endif /* PHP_ORACLE_H */
 
 /*
  * Local Variables:

diff --git a/ext/pcre/pcrelib/pcre.h b/ext/pcre/pcrelib/pcre.h
index 85e2e742599556f07bbb86009ce786ad6b45bf44..f55b44c0bff712e45b780ad31252d9bbe8ce3142 100644 (file)
--- a/ext/pcre/pcrelib/pcre.h
+++ b/ext/pcre/pcrelib/pcre.h
@@ -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

diff --git a/ext/pcre/pcrelib/pcreposix.h b/ext/pcre/pcrelib/pcreposix.h
index 7660acbd553b0e35d45cfe5b8a02e13aa5f99fe2..e9daaa21ca22a41dc1435633a216ff0c2d7d3e39 100644 (file)
--- a/ext/pcre/pcrelib/pcreposix.h
+++ b/ext/pcre/pcrelib/pcreposix.h
@@ -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

diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index d796caa1e24c4ca0edb374fc5691113aa8b8cfd6..addb5f1fec0cdc2419da77a0f642b1c17f4ea72c 100644 (file)
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -18,8 +18,8 @@
  
 /* $Id$ */
 
-#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 @@ extern ZEND_API php_pcre_globals pcre_globals;
 
 #define phpext_pcre_ptr pcre_module_ptr
 
-#endif /* _PHP_PCRE_H */
+#endif /* PHP_PCRE_H */

diff --git a/ext/pdf/php_pdf.h b/ext/pdf/php_pdf.h
index 29975c31dfb63f523ccbfefd6db85863bc4020cf..f664cada9666e4ef15226e88ec5dd0aca92168b0 100644 (file)
--- a/ext/pdf/php_pdf.h
+++ b/ext/pdf/php_pdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP_PDF_H
-#define _PHP_PDF_H
+#ifndef PHP_PDF_H
+#define PHP_PDF_H
 
 #if HAVE_PDFLIB
 
@@ -141,4 +141,4 @@ PHP_FUNCTION(pdf_get_image_height);
 #define pdf_module_ptr NULL
 #endif
 #define phpext_pdf_ptr pdf_module_ptr
-#endif /* _PHP_PDF_H */
+#endif /* PHP_PDF_H */

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index 4af5a8fec22c09ad83f391cd882297c5e2881c15..0cd96cac194daa61bc0d02692bcab248e9fb2a18 100644 (file)
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -19,8 +19,8 @@
  
 /* $Id$ */
 
-#ifndef _PHP_PGSQL_H
-#define _PHP_PGSQL_H
+#ifndef PHP_PGSQL_H
+#define PHP_PGSQL_H
 
 #if HAVE_PGSQL
 
@@ -142,4 +142,4 @@ extern PHP_PGSQL_API php_pgsql_globals pgsql_globals;
 
 #define phpext_pgsql_ptr pgsql_module_ptr
 
-#endif /* _PHP_PGSQL_H */
+#endif /* PHP_PGSQL_H */

diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h
index 6e363f79ffe4e84dafeb1883a9c2b5979a491c1e..33cf2d48df78d12a4e6c6bba8dc9d7813e76ea95 100644 (file)
--- a/ext/posix/php_posix.h
+++ b/ext/posix/php_posix.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ typedef struct {
 
 #define phpext_posix_ptr posix_module_ptr
 
-#endif /* _PHP_POSIX_H */
+#endif /* PHP_POSIX_H */

diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h
index 5b821f7659c6d9260b442b39bdf954108114c72f..1118e13da3da6b3a057b6cb6f9d516a559322462 100644 (file)
--- a/ext/readline/php_readline.h
+++ b/ext/readline/php_readline.h
@@ -18,8 +18,8 @@
 
 /* $Id$ */
 
-#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 @@ extern zend_module_entry readline_module_entry;
 
 #endif /* HAVE_LIBREADLINE */
 
-#endif /* _PHP_READLINE_H */
+#endif /* PHP_READLINE_H */
 

diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
index faaf08a867bb9a190f8b7fca3ff4816f0458580f..02a470992ca0c6bd69848a963feb74c73fc63d2e 100644 (file)
--- a/ext/recode/php_recode.h
+++ b/ext/recode/php_recode.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#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 @@ extern PHP_MYSQL_API php_recode_globals recode_globals;
 #define phpext_recode_ptr NULL
 #endif
 
-#endif /* _PHP_RECODE_H */
+#endif /* PHP_RECODE_H */

diff --git a/ext/rpc/com/php_com.h b/ext/rpc/com/php_com.h
index 64d9c16548763f79cc8b5bbf66d740e1591b3f42..addb22e7a366007a66d7def7ba2aef9994d54571 100644 (file)
--- a/ext/rpc/com/php_com.h
+++ b/ext/rpc/com/php_com.h
@@ -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 @@ extern zend_module_entry COM_module_entry;
 
 #define phpext_COM_ptr COM_module_ptr
 
-#endif  /* _PHP_COM_H */
+#endif  /* PHP_COM_H */

diff --git a/ext/snmp/php_snmp.h b/ext/snmp/php_snmp.h
index 73d41245213fd11032b3f5310b66c09994c92741..149246035af682f4a594e2705bf1b45a6c985fd7 100644 (file)
--- a/ext/snmp/php_snmp.h
+++ b/ext/snmp/php_snmp.h
@@ -19,8 +19,8 @@
 */
 
 /* $Id$ */
-#ifndef _PHP_SNMP_H
-#define _PHP_SNMP_H
+#ifndef PHP_SNMP_H
+#define PHP_SNMP_H
 
 #if HAVE_SNMP
 #ifndef DLEXPORT
@@ -46,4 +46,4 @@ PHP_MINFO_FUNCTION(snmp);
 
 #define phpext_snmp_ptr snmp_module_ptr
 
-#endif  /* _PHP_SNMP_H */
+#endif  /* PHP_SNMP_H */

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index ec7a2ad7ad3e4d29c29a25d20305aea9d72bcb20..a5e90232f5ed1b62c630a969ae2980adc541df3d 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _BASIC_FUNCTIONS_H
-#define _BASIC_FUNCTIONS_H
+#ifndef BASIC_FUNCTIONS_H
+#define BASIC_FUNCTIONS_H
 
 #include <sys/stat.h>
 
@@ -207,4 +207,4 @@ typedef struct {
 #define SAFE_MODE_PROTECTED_ENV_VARS   "LD_LIBRARY_PATH"
 #define SAFE_MODE_ALLOWED_ENV_VARS             "PHP_"
 
-#endif /* _BASIC_FUNCTIONS_H */
+#endif /* BASIC_FUNCTIONS_H */

diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h
index 91eb2346ec5be17979a0dddee311cc89224fb8d7..87d6ff8acdc5381a0af0be226973ebd7950f8d0a 100644 (file)
--- a/ext/standard/cyr_convert.h
+++ b/ext/standard/cyr_convert.h
@@ -29,12 +29,12 @@
 
 /* $Id$ */
 
-#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 */
 
 
 

diff --git a/ext/standard/datetime.h b/ext/standard/datetime.h
index 6171197c6108b8d70dc9416c3dc7950b36f001fe..871c25d25b01c282248c5e1aaea40f2e4de7087f 100644 (file)
--- a/ext/standard/datetime.h
+++ b/ext/standard/datetime.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _DATETIME_H
-#define _DATETIME_H
+#ifndef DATETIME_H
+#define DATETIME_H
 
 PHP_FUNCTION(time);
 PHP_FUNCTION(mktime);
@@ -54,4 +54,4 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm);
 void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
 #endif
 
-#endif /* _DATETIME_H */
+#endif /* DATETIME_H */

diff --git a/ext/standard/dl.h b/ext/standard/dl.h
index f816b72c12ba5052e1d5ac1b7778b60feef69507..be955d35dfa3f1b1ca08478678f973b259f5ce3d 100644 (file)
--- a/ext/standard/dl.h
+++ b/ext/standard/dl.h
@@ -32,8 +32,8 @@
 
 /* $Id$ */
 
-#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_FUNCTION(dl);
 
 PHP_MINFO_FUNCTION(dl);
 
-#endif /* _DL_H */
+#endif /* DL_H */

diff --git a/ext/standard/dns.h b/ext/standard/dns.h
index 1e5b755bd84fe54713dbbbb85735b8716f4dd5ae..3301df8363f0400577f1a86dafee3d186dc6acc2 100644 (file)
--- a/ext/standard/dns.h
+++ b/ext/standard/dns.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _DNS_H
-#define _DNS_H
+#ifndef DNS_H
+#define DNS_H
 
 PHP_FUNCTION(gethostbyaddr);
 PHP_FUNCTION(gethostbyname);
@@ -50,4 +50,4 @@ PHP_FUNCTION(getmxrr);
 #define INT32SZ                4
 #endif
 
-#endif /* _DNS_H */
+#endif /* DNS_H */

diff --git a/ext/standard/exec.h b/ext/standard/exec.h
index 361554b33bc204c324d98a8562ebbea4fd51859b..4f8f1b0b376f8052ecd47bf2c25294984e81ac9b 100644 (file)
--- a/ext/standard/exec.h
+++ b/ext/standard/exec.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _EXEC_H
-#define _EXEC_H
+#ifndef EXEC_H
+#define EXEC_H
 
 PHP_FUNCTION(system);
 PHP_FUNCTION(exec);
@@ -40,4 +40,4 @@ PHP_FUNCTION(passthru);
 PHP_FUNCTION(shell_exec);
 
 char *php_escape_shell_cmd(char *);
-#endif /* _EXEC_H */
+#endif /* EXEC_H */

diff --git a/ext/standard/file.h b/ext/standard/file.h
index 17757e8fc2599c7844efac6f6129f1bb1831562f..d87659f17e18a8941c8cc72aadb3abddf4cc0b4a 100644 (file)
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -31,8 +31,8 @@
 
 /* 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_popen(void);
 PHPAPI int php_file_le_socket(void);
 PHPAPI int php_file_le_uploads(void);
 
-#endif /* _FILE_H */
+#endif /* FILE_H */

diff --git a/ext/standard/flock_compat.h b/ext/standard/flock_compat.h
index a94be11091f38b05e23bae32a128c6f4fce832c2..fd16f6e6bcdbe2142e74d6acc7d55c76c95630c0 100644 (file)
--- a/ext/standard/flock_compat.h
+++ b/ext/standard/flock_compat.h
@@ -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 @@ int flock(int fd, int operation);
 extern int inet_aton(const char *, struct in_addr *);
 #endif
 
-#endif /* _FLOCK_COMPAT_H */
+#endif /* FLOCK_COMPAT_H */

diff --git a/ext/standard/fsock.h b/ext/standard/fsock.h
index 0be635232a139d186d444cbd6939fd24a50e03fe..a386daa13f4ebd447e00cf24ac2eeb54b3e2fcc5 100644 (file)
--- a/ext/standard/fsock.h
+++ b/ext/standard/fsock.h
@@ -31,8 +31,8 @@
 
 /* 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 @@ typedef struct {
 #define FLS_FETCH()
 #endif
 
-#endif /* _FSOCK_H */
+#endif /* FSOCK_H */

diff --git a/ext/standard/head.h b/ext/standard/head.h
index 6207daa6fee137d78197b6aea8816d2a0ef42f60..85785d077d42b80da99617cdfd23051c99ea9ef5 100644 (file)
--- a/ext/standard/head.h
+++ b/ext/standard/head.h
@@ -26,8 +26,8 @@
    | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    +----------------------------------------------------------------------+
  */
-#ifndef _HEAD_H
-#define _HEAD_H
+#ifndef HEAD_H
+#define HEAD_H
 
 
 /* 

diff --git a/ext/standard/html.h b/ext/standard/html.h
index 082a0e9f0809e9b80e0116997f9e4e515e151283..0030de67bc965d2e83f88db6522ab528169f22f6 100644 (file)
--- a/ext/standard/html.h
+++ b/ext/standard/html.h
@@ -29,8 +29,8 @@
 
 /* $Id$ */
 
-#ifndef _HTML_H
-#define _HTML_H
+#ifndef HTML_H
+#define HTML_H
 
 void register_html_constants(INIT_FUNC_ARGS);
 
@@ -40,4 +40,4 @@ PHP_FUNCTION(get_html_translation_table);
 
 PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all);
 
-#endif /* _HTML_H */
+#endif /* HTML_H */

diff --git a/ext/standard/info.h b/ext/standard/info.h
index cb8b2aee61b0c6a2fce4297a2eeb4c1a6807193d..9bf5c2a0029b3349668325e841103a097569156f 100644 (file)
--- a/ext/standard/info.h
+++ b/ext/standard/info.h
@@ -29,8 +29,8 @@
  */
 /* $Id$ */
 
-#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 @@ PHPAPI void php_info_print_hr(void);
 
 void register_phpinfo_constants(INIT_FUNC_ARGS);
 
-#endif /* _INFO_H */
+#endif /* INFO_H */

diff --git a/ext/standard/microtime.h b/ext/standard/microtime.h
index c815bfca82686614441078efc127d7cdd6e3b1d6..0ddf20485069f4f92c709d5cceb5a314ed46858b 100644 (file)
--- a/ext/standard/microtime.h
+++ b/ext/standard/microtime.h
@@ -29,11 +29,11 @@
 
 /* $Id$ */
 
-#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 */

diff --git a/ext/standard/pack.h b/ext/standard/pack.h
index 3550c0270b6eca8d8a024b5a6e461eb56ca6d2b7..4687cfd1ff3b494d5f4b2e59a884970ad635b56f 100644 (file)
--- a/ext/standard/pack.h
+++ b/ext/standard/pack.h
@@ -29,11 +29,11 @@
 
 /* $Id$ */
 
-#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 */

diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h
index 3497b626fa0e614c1d2c7a49170b9b34b45d4126..66bbc73844b223d9f4b742f2f231cdcc019b2dcc 100644 (file)
--- a/ext/standard/php_array.h
+++ b/ext/standard/php_array.h
@@ -21,8 +21,8 @@
 
 /* $Id$ */
 
-#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 int array_globals_id;
 extern php_array_globals array_globals;
 #endif
 
-#endif /* _PHP_ARRAY_H */
+#endif /* PHP_ARRAY_H */

diff --git a/ext/standard/php_assert.h b/ext/standard/php_assert.h
index 7d0c8ddf67ba542670fcb72de6d34c1f7d16c962..8f1d4254474c27197d11301fe6f559f21f732d83 100644 (file)
--- a/ext/standard/php_assert.h
+++ b/ext/standard/php_assert.h
@@ -18,8 +18,8 @@
 
 /* $Id$ */
 
-#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_MINFO_FUNCTION(assert);
 PHP_FUNCTION(assert);
 PHP_FUNCTION(assert_options);
 
-#endif /* _PHP_ASSERT_H */
+#endif /* PHP_ASSERT_H */

diff --git a/ext/standard/php_browscap.h b/ext/standard/php_browscap.h
index 04eb07258283b871864617df697d25ee9cc9ad13..1121f51129c8a83cffb0ab74e46e3dd761660bc1 100644 (file)
--- a/ext/standard/php_browscap.h
+++ b/ext/standard/php_browscap.h
@@ -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 */

diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h
index 566a97c713718506608aa6835eb982654d2f5d55..6c6593b067e21613c04b489ea945e74202257d2e 100644 (file)
--- a/ext/standard/php_dir.h
+++ b/ext/standard/php_dir.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#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(rewinddir);
 PHP_FUNCTION(readdir);
 PHP_FUNCTION(getdir);
 
-#endif /* _PHP_DIR_H */
+#endif /* PHP_DIR_H */

diff --git a/ext/standard/php_ext_syslog.h b/ext/standard/php_ext_syslog.h
index bf905fb5fc30edd0cb6a74f15fb2e4e44268c1d5..e14d0e9e72c54b2c2cc0e88360506ba2167ae8a7 100644 (file)
--- a/ext/standard/php_ext_syslog.h
+++ b/ext/standard/php_ext_syslog.h
@@ -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 @@ PHP_FUNCTION(define_syslog_variables);
 
 #endif
 
-#endif /* _PHP_EXT_SYSLOG_H */
+#endif /* PHP_EXT_SYSLOG_H */

diff --git a/ext/standard/php_link.h b/ext/standard/php_link.h
index f8189e850ffb646330118e679218cb339f5035f3..01755c27f42e0ad2565df8be3aece39551833b0c 100644 (file)
--- a/ext/standard/php_link.h
+++ b/ext/standard/php_link.h
@@ -29,8 +29,8 @@
  */
 
 /* $Id$ */
-#ifndef _PHP_LINK_H
-#define _PHP_LINK_H
+#ifndef PHP_LINK_H
+#define PHP_LINK_H
 
 #ifdef HAVE_SYMLINK
 
@@ -41,4 +41,4 @@ PHP_FUNCTION(symlink);
 
 #endif
 
-#endif /* _PHP_LINK_H */
+#endif /* PHP_LINK_H */

diff --git a/ext/standard/php_rand.h b/ext/standard/php_rand.h
index e6c50f1745c6a9c34d3ad771dd797e639124f82c..7ef8b6d9abbb10201f6002c4b7a6c45ea94a1f2b 100644 (file)
--- a/ext/standard/php_rand.h
+++ b/ext/standard/php_rand.h
@@ -21,8 +21,8 @@
  */
 /* $Id$ */
 
-#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 */

diff --git a/ext/standard/quot_print.h b/ext/standard/quot_print.h
index c8a826a6f54039eddc0931b8af7f8aa15863c077..985e83a4dee0707dd7837cef88ff6b61e4be9078 100644 (file)
--- a/ext/standard/quot_print.h
+++ b/ext/standard/quot_print.h
@@ -29,9 +29,9 @@
 
 /* $Id$ */
 
-#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 */

diff --git a/ext/standard/reg.h b/ext/standard/reg.h
index 57c403eb094020e7766b14bd7832db6ea2b279e2..812717e1aea4e803478883fc0010c7a70fbb1000 100644 (file)
--- a/ext/standard/reg.h
+++ b/ext/standard/reg.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ PHP_MINFO_FUNCTION(regex);
 #define REGLS_FETCH()
 #endif
 
-#endif /* _REG_H */
+#endif /* REG_H */

diff --git a/ext/standard/type.h b/ext/standard/type.h
index c5c4ae6b36f48964cdd5dcf4638d9a3d933a87f0..c9cb00e0cfeb4cd0c8f0220be59e8eac7e49eaf2 100644 (file)
--- a/ext/standard/type.h
+++ b/ext/standard/type.h
@@ -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);

diff --git a/ext/standard/uniqid.h b/ext/standard/uniqid.h
index 3666e0a8c2693bf834bcf7afd8cb004491498b6a..9432e6b32432aa90fdf6d553ae1b7f4fb4cec061 100644 (file)
--- a/ext/standard/uniqid.h
+++ b/ext/standard/uniqid.h
@@ -29,9 +29,9 @@
 
 /* $Id$ */
 
-#ifndef _UNIQID_H
-#define _UNIQID_H
+#ifndef UNIQID_H
+#define UNIQID_H
 
 PHP_FUNCTION(uniqid);
 
-#endif /* _UNIQID_H */
+#endif /* UNIQID_H */

diff --git a/ext/standard/url.h b/ext/standard/url.h
index 6b49640dd86ea382045b78d7e2e3fa2e60baaa2e..796a218b5f43c221eee159c17ad83bca7c225112 100644 (file)
--- a/ext/standard/url.h
+++ b/ext/standard/url.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _URL_H
-#define _URL_H
+#ifndef URL_H
+#define URL_H
 
 typedef struct url {
        char *scheme;
@@ -55,7 +55,7 @@ PHP_FUNCTION(urldecode);
 PHP_FUNCTION(rawurlencode);
 PHP_FUNCTION(rawurldecode);
 
-#endif /* _URL_H */
+#endif /* URL_H */
 
 /*
  * Local variables:

diff --git a/ext/swf/php_swf.h b/ext/swf/php_swf.h
index d6db4154db8573a57cc0cc052c4f1dc48af5a2c0..6c00a97ef4700f82b503c9041abc0361fed98d3c 100644 (file)
--- a/ext/swf/php_swf.h
+++ b/ext/swf/php_swf.h
@@ -18,8 +18,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SWF_H
-#define _PHP_SWF_H
+#ifndef PHP_SWF_H
+#define PHP_SWF_H
 
 #if HAVE_SWF
 

diff --git a/ext/sybase_ct/php_sybase_ct.h b/ext/sybase_ct/php_sybase_ct.h
index 3cb6fc8db1754b6976aba6d3975e1d9173d6bdf2..22c41da29d47b2b1503d4fdfdd487fd5cd08dfd4 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.h
+++ b/ext/sybase_ct/php_sybase_ct.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#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 @@ typedef struct {
 
 #define phpext_sybase_ct_ptr sybase_module_ptr
 
-#endif /* _PHP_SYBASE_CT_H */
+#endif /* PHP_SYBASE_CT_H */

diff --git a/ext/sysvsem/php_sysvsem.h b/ext/sysvsem/php_sysvsem.h
index d26195fb101384db43bebcfaafe533166994bcc5..bc0d74c18e59d25adb7f4aaffbbc610222146bf7 100644 (file)
--- a/ext/sysvsem/php_sysvsem.h
+++ b/ext/sysvsem/php_sysvsem.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SYSVSEM_H
-#define _PHP_SYSVSEM_H
+#ifndef PHP_SYSVSEM_H
+#define PHP_SYSVSEM_H
 
 #if HAVE_SYSVSEM
 
@@ -64,4 +64,4 @@ extern sysvsem_module php_sysvsem_module;
 
 #define phpext_sysvsem_ptr sysvsem_module_ptr
 
-#endif /* _PHP_SYSVSEM_H */
+#endif /* PHP_SYSVSEM_H */

diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index 27c8ef6be3e0ddc594a2854a7f29cf7574b164c1..6536255d8b653239eec0710c2508d7d81db3b128 100644 (file)
--- a/ext/sysvshm/php_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_SYSVSHM_H
-#define _PHP_SYSVSHM_H
+#ifndef PHP_SYSVSHM_H
+#define PHP_SYSVSHM_H
 
 #if HAVE_SYSVSHM
 
@@ -94,4 +94,4 @@ extern sysvshm_module php_sysvshm;
 
 #define phpext_sysvshm_ptr sysvshm_module_ptr
 
-#endif /* _PHP_SYSVSHM_H */
+#endif /* PHP_SYSVSHM_H */

diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 4f9b0f3eb5753ded38d6f792c38e0bbe4bc1b78c..a1e2db60335721d65abdc7336d895ab7db9355e5 100644 (file)
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_XML_H
-#define _PHP_XML_H
+#ifndef PHP_XML_H
+#define PHP_XML_H
 
 #ifdef HAVE_LIBEXPAT
 
@@ -151,7 +151,7 @@ PHPAPI char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *);
 #define XMLLS_FETCH()
 #endif
 
-#endif /* _PHP_XML_H */
+#endif /* PHP_XML_H */
 
 /*
  * Local variables:

diff --git a/ext/yp/php_yp.h b/ext/yp/php_yp.h
index bd9a88beeedae7b63e3bfe66eea3afb626c2d456..2d44059ee48fbe70797f94457d7b27cb2391beca 100644 (file)
--- a/ext/yp/php_yp.h
+++ b/ext/yp/php_yp.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */ 
 
-#ifndef _PHP_YP_H
-#define _PHP_YP_H
+#ifndef PHP_YP_H
+#define PHP_YP_H
 
 #if HAVE_YP
 
@@ -53,4 +53,4 @@ PHP_MINFO_FUNCTION(yp);
 
 #define phpext_yp_ptr yp_module_ptr
 
-#endif /* _PHP_YP_H */
+#endif /* PHP_YP_H */

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 9c7b322c6230c98201f7d444cb70f76f17bb9df6..e67f051f0347dd22d82609f306d4b1e6544fffd0 100644 (file)
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -25,8 +25,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_ZLIB_H
-#define _PHP_ZLIB_H
+#ifndef PHP_ZLIB_H
+#define PHP_ZLIB_H
 
 #if HAVE_ZLIB
 
@@ -73,4 +73,4 @@ PHP_FUNCTION(gzuncompress);
 
 #define phpext_zlib_ptr zlib_module_ptr
 
-#endif /* _PHP_ZLIB_H */
+#endif /* PHP_ZLIB_H */

diff --git a/main/SAPI.h b/main/SAPI.h
index 5ed4fdb67d2a96319b68e429fb225d92515082b2..2bd91421a9e86b76d13962ae07de9ef92d61eaf4 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -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 @@ SAPI_POST_READER_FUNC(sapi_read_standard_form_data);
 
 #define STANDARD_SAPI_MODULE_PROPERTIES NULL
 
-#endif /* _NEW_SAPI_H */
+#endif /* SAPI_H */
 
 /*
  * Local variables:

diff --git a/main/internal_functions_registry.h b/main/internal_functions_registry.h
index a06eaa349f8cbb3457c408f325bce83d3862cd9b..c34a3ec3c44b7ad076abe59453a5aaf251017512 100644 (file)
--- a/main/internal_functions_registry.h
+++ b/main/internal_functions_registry.h
@@ -20,8 +20,8 @@
 
 /* $Id$ */
 
-#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);
 

diff --git a/main/php.h b/main/php.h
index f1d743faab9746d259a47231ebe8ad7754b3a061..f2d740e239328c74915eaef679215156229dcaee 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP_H
-#define _PHP_H
+#ifndef PHP_H
+#define PHP_H
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>

diff --git a/main/php_content_types.h b/main/php_content_types.h
index af512ed3aba6b7ec8d1de13d71738cc09e3bd3fc..7752b8c121b855d056f3af30858482152501cd5e 100644 (file)
--- a/main/php_content_types.h
+++ b/main/php_content_types.h
@@ -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_READER_FUNC(php_default_post_reader);
 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 */

diff --git a/main/php_globals.h b/main/php_globals.h
index aba2b966bb7d04f7e9240463d99d03a6f11739a0..ea0e3e511ba62395dbcc0ca1a9b358d6a28e8b87 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -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 @@ struct _php_core_globals {
 };
 
 
-#endif /* _PHP_GLOBALS_H */
+#endif /* PHP_GLOBALS_H */
 
 /*
  * Local variables:

diff --git a/main/php_ini.h b/main/php_ini.h
index 47965baaa51bfe27049ddc5ed7f5a4c08b59e6a3..4fdaf126d8c54e7ea9ddea1715d33a8d625cd667 100644 (file)
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -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 @@ PHPAPI PHP_INI_MH(OnUpdateStringUnempty);
 #define PHP_INI_STAGE_DEACTIVATE       (1<<3)
 #define PHP_INI_STAGE_RUNTIME          (1<<4)
 
-#endif /* _PHP_INI_H */
+#endif /* PHP_INI_H */

diff --git a/main/php_realpath.h b/main/php_realpath.h
index 53b72d7f60c0af5acefe2c74020368a70ed74c48..8030f2b06741ce50780e54973f9a31005c8710ad 100644 (file)
--- a/main/php_realpath.h
+++ b/main/php_realpath.h
@@ -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 []);
 

diff --git a/main/php_regex.h b/main/php_regex.h
index f4dc865163bfbd3fa38297531d3cf4c877325701..c418c1f57683823b8e7db9bc49f61b811f8e4baf 100644 (file)
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -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 */

diff --git a/main/php_ticks.h b/main/php_ticks.h
index 3b06448c1cafa40e8f5e30a0c46e10a9285c6283..6d4bd780464ad3ae6711e33224a9b992e3cd3620 100644 (file)
--- a/main/php_ticks.h
+++ b/main/php_ticks.h
@@ -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);

diff --git a/main/php_variables.h b/main/php_variables.h
index 7c36d6fd28a877e6ec6968b0681e495321249727..8eb1a2078b11fa667f8eefea75ee011d5ee94726 100644 (file)
--- a/main/php_variables.h
+++ b/main/php_variables.h
@@ -29,8 +29,8 @@
  */
 /* $Id$ */
 
-#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(char *var, char *val, pval *track_vars_array E
 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 */

diff --git a/main/rfc1867.h b/main/rfc1867.h
index b50cf4654950735a87aad70cba5f3b245fd721b5..7e84022fe894c3bfd4cb4e1e8329082b55179686 100644 (file)
--- a/main/rfc1867.h
+++ b/main/rfc1867.h
@@ -1,5 +1,5 @@
-#ifndef _RFC1867_H
-#define _RFC1867_H
+#ifndef RFC1867_H
+#define RFC1867_H
 
 #include "SAPI.h"
 
@@ -10,4 +10,4 @@ SAPI_POST_HANDLER_FUNC(rfc1867_post_handler);
 
 #define FILE_UPLOAD_INPUT_BUFFER_SIZE 8192
 
-#endif /* _RFC1867_H */
+#endif /* RFC1867_H */

diff --git a/main/safe_mode.h b/main/safe_mode.h
index c765a6e37d3366d0130f8715928fbb80f47f8f38..25eba90c4f0e7859a25fa479b0d591afa8c2b23c 100644 (file)
--- a/main/safe_mode.h
+++ b/main/safe_mode.h
@@ -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);

diff --git a/main/snprintf.h b/main/snprintf.h
index 88900b980b2557a14bea9dfc4b7856ec336c143a..aa48093061b54241830db23c651d183e644a4820 100644 (file)
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -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 @@ int php_sprintf (char* s, const char* format, ...);
 #define sprintf php_sprintf
 #endif
 
-#endif /* _PHP_SNPRINTF_H */
+#endif /* SNPRINTF_H */
 
 /*
  * Local variables:

diff --git a/sapi/apache/mod_php4.h b/sapi/apache/mod_php4.h
index 73a087b4abfc5c7fbb03c0d0022b8950a6027a48..9a2efe04289da669c8b581241fc552d7e976b80a 100644 (file)
--- a/sapi/apache/mod_php4.h
+++ b/sapi/apache/mod_php4.h
@@ -17,8 +17,8 @@
  */
 /* $Id$ */
 
-#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 @@ extern php_apache_info_struct php_apache_info;
 #define S_IXUSR _S_IEXEC
 #endif
 
-#endif                                                 /* _MOD_PHP4_H */
+#endif                                                 /* MOD_PHP4_H */
 
 /*
  * Local variables:

diff --git a/win32/php_registry.h b/win32/php_registry.h
index ad722a560783eea08912d46faedc704dddec8895..275d89edd2b45c7b98b143c7a1859d288d4282f5 100644 (file)
--- a/win32/php_registry.h
+++ b/win32/php_registry.h
@@ -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 */

diff --git a/win32/pwd.h b/win32/pwd.h
index d0ae7ac35b9ad1dd8145247724989467726dedf3..d1f66859d72919c3d211c3fe81ecadb3ca2a751d 100644 (file)
--- a/win32/pwd.h
+++ b/win32/pwd.h
@@ -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;

diff --git a/win32/readdir.h b/win32/readdir.h
index f6c576252c650c379fa4add5138371a696da8aab..b0f1ad9e6f99b386a8ee656f8095be9bc681e044 100644 (file)
--- a/win32/readdir.h
+++ b/win32/readdir.h
@@ -1,5 +1,5 @@
-#ifndef _READDIR_H
-#define _READDIR_H
+#ifndef READDIR_H
+#define READDIR_H
 
 
 /*
@@ -41,4 +41,4 @@ int closedir(DIR *);
 void rewinddir(DIR *);
 
 
-#endif /* _READDIR_H */
\ No newline at end of file
+#endif /* READDIR_H */

diff --git a/win32/time.h b/win32/time.h
index b8f59ceb3a2c6ca8ffb050de4b61c9ced7a4472c..457d4fa9e0c72fe9f9803c12e4e79394c0ac9a26 100644 (file)
--- a/win32/time.h
+++ b/win32/time.h
@@ -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 gettimeofday(struct timeval *time_Info, struct timezone *timezone_Inf
 extern int setitimer(int which, const struct itimerval *value,
                                         struct itimerval *ovalue);
 
-#endif
\ No newline at end of file
+#endif