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.

26 files changed, 76 insertions, 76 deletions

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index ec7a2ad7ad..a5e90232f5 100644
--- 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 91eb2346ec..87d6ff8acd 100644
--- 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 6171197c61..871c25d25b 100644
--- 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 f816b72c12..be955d35df 100644
--- 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 1e5b755bd8..3301df8363 100644
--- 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 361554b33b..4f8f1b0b37 100644
--- 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 17757e8fc2..d87659f17e 100644
--- 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 a94be11091..fd16f6e6bc 100644
--- 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 0be635232a..a386daa13f 100644
--- 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 6207daa6fe..85785d077d 100644
--- 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 082a0e9f08..0030de67bc 100644
--- 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 cb8b2aee61..9bf5c2a002 100644
--- 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 c815bfca82..0ddf204850 100644
--- 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 3550c0270b..4687cfd1ff 100644
--- 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 3497b626fa..66bbc73844 100644
--- 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 7d0c8ddf67..8f1d425447 100644
--- 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 04eb072582..1121f51129 100644
--- 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 566a97c713..6c6593b067 100644
--- 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 bf905fb5fc..e14d0e9e72 100644
--- 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 f8189e850f..01755c27f4 100644
--- 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 e6c50f1745..7ef8b6d9ab 100644
--- 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 c8a826a6f5..985e83a4de 100644
--- 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 57c403eb09..812717e1ae 100644
--- 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 c5c4ae6b36..c9cb00e0cf 100644
--- 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 3666e0a8c2..9432e6b324 100644
--- 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 6b49640dd8..796a218b5f 100644
--- 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: