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.

13 files changed, 34 insertions, 34 deletions

diff --git a/main/SAPI.h b/main/SAPI.h
index 5ed4fdb67d..2bd91421a9 100644
--- 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 a06eaa349f..c34a3ec3c4 100644
--- 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 f1d743faab..f2d740e239 100644
--- 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 af512ed3ab..7752b8c121 100644
--- 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 aba2b966bb..ea0e3e511b 100644
--- 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 47965baaa5..4fdaf126d8 100644
--- 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 53b72d7f60..8030f2b067 100644
--- 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 f4dc865163..c418c1f576 100644
--- 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 3b06448c1c..6d4bd78046 100644
--- 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 7c36d6fd28..8eb1a2078b 100644
--- 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 b50cf46549..7e84022fe8 100644
--- 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 c765a6e37d..25eba90c4f 100644
--- 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 88900b980b..aa48093061 100644
--- 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: