diff options
| -rw-r--r-- | Zend/FlexLexer.h | 4 | ||||
| -rw-r--r-- | Zend/zend-scanner.h | 4 | ||||
| -rw-r--r-- | Zend/zend_alloc.h | 4 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 6 | ||||
| -rw-r--r-- | Zend/zend_constants.h | 4 | ||||
| -rw-r--r-- | Zend/zend_dynamic_array.h | 4 | ||||
| -rw-r--r-- | Zend/zend_execute.h | 6 | ||||
| -rw-r--r-- | Zend/zend_globals.h | 6 | ||||
| -rw-r--r-- | Zend/zend_hash.h | 6 | ||||
| -rw-r--r-- | Zend/zend_highlight.h | 4 | ||||
| -rw-r--r-- | Zend/zend_list.h | 4 | ||||
| -rw-r--r-- | Zend/zend_operators.h | 4 | ||||
| -rw-r--r-- | Zend/zend_static_allocator.h | 6 | ||||
| -rw-r--r-- | Zend/zend_variables.h | 4 |
14 files changed, 33 insertions, 33 deletions
diff --git a/Zend/FlexLexer.h b/Zend/FlexLexer.h index 549177b8b9..fd65258570 100644 --- a/Zend/FlexLexer.h +++ b/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++" { diff --git a/Zend/zend-scanner.h b/Zend/zend-scanner.h index b455b3ad08..e6e2f12f95 100644 --- a/Zend/zend-scanner.h +++ b/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 diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index df24b98f70..cd9b742e83 100644 --- a/Zend/zend_alloc.h +++ b/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> diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 4bb716cc8b..e7376f3c2b 100644 --- a/Zend/zend_compile.h +++ b/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 */ diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h index 09075cc56b..56f752f236 100644 --- a/Zend/zend_constants.h +++ b/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" diff --git a/Zend/zend_dynamic_array.h b/Zend/zend_dynamic_array.h index 2085498198..7940f6a681 100644 --- a/Zend/zend_dynamic_array.h +++ b/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; diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index be1dc5350b..0a85b843b0 100644 --- a/Zend/zend_execute.h +++ b/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 */ diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index eafd922fd3..3223aaa210 100644 --- a/Zend/zend_globals.h +++ b/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 */ diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 736095d4ea..2c722660cb 100644 --- a/Zend/zend_hash.h +++ b/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 */ diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h index d6b407fc1f..e9dff976f0 100644 --- a/Zend/zend_highlight.h +++ b/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 */ diff --git a/Zend/zend_list.h b/Zend/zend_list.h index 584a5cfdcc..10006265db 100644 --- a/Zend/zend_list.h +++ b/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" diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 5b95f6f454..ef9c8da3ab 100644 --- a/Zend/zend_operators.h +++ b/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> diff --git a/Zend/zend_static_allocator.h b/Zend/zend_static_allocator.h index 5bb988173c..568ddf67fa 100644 --- a/Zend/zend_static_allocator.h +++ b/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 */ diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 7d080fa223..9f83ca69a4 100644 --- a/Zend/zend_variables.h +++ b/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); |