Replace macros which begin with an underscore through an appropiately

named macro.

Zend/FlexLexer.h

@@ -41,9 +41,9 @@
 //	#include <FlexLexer.h>
 //	...
 
-#ifndef __FLEX_LEXER_H
+#ifndef FLEXLEXER_H
 // Never included before - need to define base class.
-#define __FLEX_LEXER_H
+#define FLEXLEXER_H
 #include <iostream.h>
 
 extern "C++" {

Zend/zend-scanner.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _LANGUAGE_SCANNER_H
-#define _LANGUAGE_SCANNER_H
+#ifndef ZEND_SCANNER_H
+#define ZEND_SCANNER_H
 
 #ifdef ZTS
 class ZendFlexLexer : public yyFlexLexer

Zend/zend_alloc.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _ALLOC_H
-#define _ALLOC_H
+#ifndef ZEND_ALLOC_H
+#define ZEND_ALLOC_H
 
 #include <stdio.h>
 

Zend/zend_compile.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _COMPILE_H
-#define _COMPILE_H
+#ifndef ZEND_COMPILE_H
+#define ZEND_COMPILE_H
 
 #include "zend.h"
 
@@ -624,4 +624,4 @@ int zendlex(znode *zendlval CLS_DC);
 
 END_EXTERN_C()
 
-#endif /* _COMPILE_H */
+#endif /* ZEND_COMPILE_H */

Zend/zend_constants.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _CONSTANTS_H
-#define _CONSTANTS_H
+#ifndef ZEND_CONSTANTS_H
+#define ZEND_CONSTANTS_H
 
 #include "zend_globals.h"
 

Zend/zend_dynamic_array.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _DYNAMIC_ARRAY_H
-#define _DYNAMIC_ARRAY_H
+#ifndef ZEND_DYNAMIC_ARRAY_H
+#define ZEND_DYNAMIC_ARRAY_H
 
 typedef struct _dynamic_array {
 	char *array;

Zend/zend_execute.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _EXECUTE_H
-#define _EXECUTE_H
+#ifndef ZEND_EXECUTE_H
+#define ZEND_EXECUTE_H
 
 #include "zend_compile.h"
 #include "zend_hash.h"
@@ -229,4 +229,4 @@ ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **var
 #define IS_OVERLOADED_OBJECT 1
 #define IS_STRING_OFFSET 2
 
-#endif /* _EXECUTE_H */
+#endif /* ZEND_EXECUTE_H */

Zend/zend_globals.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _T_GLOBALS_H
-#define _T_GLOBALS_H
+#ifndef ZEND_GLOBALS_H
+#define ZEND_GLOBALS_H
 
 
 #include <setjmp.h>
@@ -217,4 +217,4 @@ struct _zend_alloc_globals {
 #endif
 };
 
-#endif /* _T_GLOBALS_H */
+#endif /* ZEND_GLOBALS_H */

Zend/zend_hash.h

@@ -17,8 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef _HASH_
-#define _HASH_
+#ifndef ZEND_HASH_H
+#define ZEND_HASH_H
 
 #include <sys/types.h>
 
@@ -193,4 +193,4 @@ END_EXTERN_C()
 	zend_hash_init(ht, n, NULL, ZVAL_PTR_DTOR, persistent)
 
 
-#endif							/* _HASH_ */
+#endif							/* ZEND_HASH_H */

Zend/zend_highlight.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _HIGHLIGHT_H
-#define _HIGHLIGHT_H
+#ifndef ZEND_HIGHLIGHT_H
+#define ZEND_HIGHLIGHT_H
 
 #define HL_COMMENT_COLOR     "#FF8000"    /* orange */
 #define HL_DEFAULT_COLOR     "#0000BB"    /* blue */

Zend/zend_list.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _LIST_H
-#define _LIST_H
+#ifndef ZEND_LIST_H
+#define ZEND_LIST_H
 
 #include "zend_hash.h"
 #include "zend_globals.h"

Zend/zend_operators.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _OPERATORS_H
-#define _OPERATORS_H
+#ifndef ZEND_OPERATORS_H
+#define ZEND_OPERATORS_H
 
 #include <errno.h>
 #include <math.h>

Zend/zend_static_allocator.h

@@ -16,8 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef _STATIC_ALLOCATOR_H
-#define _STATIC_ALLOCATOR_H
+#ifndef ZEND_STATIC_ALLOCATOR_H
+#define ZEND_STATIC_ALLOCATOR_H
 
 #define ALLOCATOR_BLOCK_SIZE 400000
 
@@ -42,4 +42,4 @@ void static_allocator_init(StaticAllocator *sa);
 char *static_allocator_allocate(StaticAllocator *sa, zend_uint size);
 void static_allocator_destroy(StaticAllocator *sa);
 
-#endif /* _STATIC_ALLOCATOR_H */
+#endif /* ZEND_STATIC_ALLOCATOR_H */

Zend/zend_variables.h

@@ -18,8 +18,8 @@
 */
 
 
-#ifndef _VARIABLES_H
-#define _VARIABLES_H
+#ifndef ZEND_VARIABLES_H
+#define ZEND_VARIABLES_H
 
 
 ZEND_API int zend_print_variable(zval *var);