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.

15 files changed, 42 insertions, 42 deletions

diff --git a/Zend/zend.h b/Zend/zend.h
index f8c065b9b2..a36b0ba710 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_H
-#define _ZEND_H
+#ifndef ZEND_H
+#define ZEND_H
 
 #define ZEND_VERSION "1.0.1"
 
@@ -428,7 +428,7 @@ ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents);
 #define EMPTY_SWITCH_DEFAULT_CASE()
 #endif
 
-#endif /* _ZEND_H */
+#endif /* ZEND_H */
 
 /*
  * Local variables:
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 31b81f2572..f603f0e50e 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_API_H
-#define _ZEND_API_H
+#ifndef ZEND_API_H
+#define ZEND_API_H
 
 #include "modules.h"
 #include "zend_list.h"
@@ -416,7 +416,7 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
 #define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? (p)->value.obj.properties : NULL)))
 #define ZVAL_IS_NULL(z) ((z)->type==IS_NULL)
 
-#endif /* _ZEND_API_H */
+#endif /* ZEND_API_H */
 
 /*
  * Local variables:
diff --git a/Zend/zend_builtin_functions.h b/Zend/zend_builtin_functions.h
index 60952922be..e6828fabc1 100644
--- a/Zend/zend_builtin_functions.h
+++ b/Zend/zend_builtin_functions.h
@@ -18,9 +18,9 @@
 */
 
 
-#ifndef _ZEND_BUILTIN_FUNCTIONS_H
-#define _ZEND_BUILTIN_FUNCTIONS_H
+#ifndef ZEND_BUILTIN_FUNCTIONS_H
+#define ZEND_BUILTIN_FUNCTIONS_H
 
 int zend_startup_builtin_functions(void);
 
-#endif /* _ZEND_BUILTIN_FUNCTIONS_H */
+#endif /* ZEND_BUILTIN_FUNCTIONS_H */
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index fad196f4d5..b228fe1ebb 100644
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_CONFIG_W32_H
-#define _ZEND_CONFIG_W32_H
+#ifndef ZEND_CONFIG_W32_H
+#define ZEND_CONFIG_W32_H
 
 
 #include <string.h>
@@ -84,4 +84,4 @@ typedef unsigned int uint;
 
 #define ZEND_SERVICE_MB_STYLE		(MB_TOPMOST|MB_SERVICE_NOTIFICATION)
 
-#endif /* _ZEND_CONFIG_W32_H */
+#endif /* ZEND_CONFIG_W32_H */
diff --git a/Zend/zend_dynamic_array.h b/Zend/zend_dynamic_array.h
index 838bc117e4..2085498198 100644
--- a/Zend/zend_dynamic_array.h
+++ b/Zend/zend_dynamic_array.h
@@ -35,4 +35,4 @@ ZEND_API void *zend_dynamic_array_pop(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index);
 END_EXTERN_C()
 
-#endif /* _ZEND_DYNAMIC_ARRAY_H */
+#endif /* ZEND_DYNAMIC_ARRAY_H */
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index 52615770f0..8b43dc1988 100644
--- a/Zend/zend_errors.h
+++ b/Zend/zend_errors.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_ERRORS_H
-#define _ZEND_ERRORS_H
+#ifndef ZEND_ERRORS_H
+#define ZEND_ERRORS_H
 
 #define E_ERROR				(1<<0L)
 #define E_WARNING			(1<<1L)
@@ -36,5 +36,5 @@
 #define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE)
 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
 
-#endif /* _ZEND_ERRORS_H */
+#endif /* ZEND_ERRORS_H */
 
diff --git a/Zend/zend_execute_locks.h b/Zend/zend_execute_locks.h
index b24ec642e9..c37a3a3e46 100644
--- a/Zend/zend_execute_locks.h
+++ b/Zend/zend_execute_locks.h
@@ -1,5 +1,5 @@
-#ifndef _ZEND_EXECUTE_LOCKS_H
-#define _ZEND_EXECUTE_LOCKS_H
+#ifndef ZEND_EXECUTE_LOCKS_H
+#define ZEND_EXECUTE_LOCKS_H
 
 #define PZVAL_LOCK(z)	((z)->refcount++)
 #define PZVAL_UNLOCK(z)	{ ((z)->refcount--);								\
@@ -19,4 +19,4 @@
 
 #define SELECTIVE_PZVAL_LOCK(pzv, pzn)		if (!((pzn)->u.EA.type & EXT_TYPE_UNUSED)) { PZVAL_LOCK(pzv); }
 
-#endif /* _ZEND_EXECUTE_LOCKS_H */
+#endif /* ZEND_EXECUTE_LOCKS_H */
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 83b5bbc2ea..f99b5374a6 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_EXTENSIONS_H
-#define _ZEND_EXTENSIONS_H
+#ifndef ZEND_EXTENSIONS_H
+#define ZEND_EXTENSIONS_H
 
 #include "zend_compile.h"
 
@@ -94,4 +94,4 @@ void zend_append_version_info(zend_extension *extension);
 int zend_startup_extensions(void);
 void zend_shutdown_extensions(void);
 
-#endif /* _ZEND_EXTENSIONS_H */
+#endif /* ZEND_EXTENSIONS_H */
diff --git a/Zend/zend_fast_cache.h b/Zend/zend_fast_cache.h
index ab238b2d11..883bb589ee 100644
--- a/Zend/zend_fast_cache.h
+++ b/Zend/zend_fast_cache.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_FAST_CACHE_H
-#define _ZEND_FAST_CACHE_H
+#ifndef ZEND_FAST_CACHE_H
+#define ZEND_FAST_CACHE_H
 
 #ifndef ZEND_ENABLE_FAST_CACHE
 # if ZEND_DEBUG
@@ -130,7 +130,7 @@ typedef struct _zend_fast_cache_list_entry {
 #define FREE_HASHTABLE_REL(ht)	\
 	ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
 
-#endif /* _ZEND_FAST_CACHE_H */
+#endif /* ZEND_FAST_CACHE_H */
 
 /*
  * Local variables:
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index 8735da4bf0..62e83a65e0 100644
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_GLOBALS_MACROS_H
-#define _ZEND_GLOBALS_MACROS_H
+#ifndef ZEND_GLOBALS_MACROS_H
+#define ZEND_GLOBALS_MACROS_H
 
 typedef struct _zend_compiler_globals zend_compiler_globals;
 typedef struct _zend_executor_globals zend_executor_globals;
@@ -85,5 +85,5 @@ extern ZEND_API zend_executor_globals executor_globals;
 extern ZEND_API zend_alloc_globals alloc_globals;
 #endif
 
-#endif /* _ZEND_GLOBALS_MACROS_H */
+#endif /* ZEND_GLOBALS_MACROS_H */
 
diff --git a/Zend/zend_indent.h b/Zend/zend_indent.h
index a4fa3f0520..e7d820d22c 100644
--- a/Zend/zend_indent.h
+++ b/Zend/zend_indent.h
@@ -18,9 +18,9 @@
 */
 
 
-#ifndef _ZEND_INDENT_H
-#define _ZEND_INDENT_H
+#ifndef ZEND_INDENT_H
+#define ZEND_INDENT_H
 
 ZEND_API void zend_indent(void);
 
-#endif /* _ZEND_INDENT_H */
+#endif /* ZEND_INDENT_H */
diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 476708d69c..2e80331855 100644
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_LLIST_H
-#define _ZEND_LLIST_H
+#ifndef ZEND_LLIST_H
+#define ZEND_LLIST_H
 
 #include <stdlib.h>
 
@@ -73,4 +73,4 @@ ZEND_API void *zend_llist_get_prev_ex(zend_llist *l, zend_llist_position *pos);
 
 END_EXTERN_C()
 
-#endif /* _ZEND_LLIST_H */
+#endif /* ZEND_LLIST_H */
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 16d918c75b..1586630af1 100644
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _MODULES_H
-#define _MODULES_H
+#ifndef MODULES_H
+#define MODULES_H
 
 #define INIT_FUNC_ARGS		int type, int module_number ELS_DC
 #define INIT_FUNC_ARGS_PASSTHRU	type, module_number ELS_CC
diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index d15268829b..b19feaccf5 100644
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_PTR_STACK_H
-#define _ZEND_PTR_STACK_H
+#ifndef ZEND_PTR_STACK_H
+#define ZEND_PTR_STACK_H
 
 typedef struct _zend_ptr_stack {
 	int top, max;
@@ -40,4 +40,4 @@ ZEND_API void zend_ptr_stack_apply(zend_ptr_stack *stack, void (*func)(void *));
 ZEND_API void zend_ptr_stack_clean(zend_ptr_stack *stack, void (*func)(void *), zend_bool free_elements);
 ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack);
 
-#endif /* _ZEND_PTR_STACK_H */
+#endif /* ZEND_PTR_STACK_H */
diff --git a/Zend/zend_stack.h b/Zend/zend_stack.h
index 9304f647d9..a57b9ebe50 100644
--- a/Zend/zend_stack.h
+++ b/Zend/zend_stack.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ZEND_STACK_H
-#define _ZEND_STACK_H
+#ifndef ZEND_STACK_H
+#define ZEND_STACK_H
 
 typedef struct _zend_stack {
 	int top, max;
@@ -44,4 +44,4 @@ ZEND_API void zend_stack_apply_with_argument(zend_stack *stack, int type, int (*
 #define ZEND_STACK_APPLY_TOPDOWN	1
 #define ZEND_STACK_APPLY_BOTTOMUP	2
 
-#endif /* _ZEND_STACK_H */
+#endif /* ZEND_STACK_H */