diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /win32/php_stdbool.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'win32/php_stdbool.h')
| -rw-r--r-- | win32/php_stdbool.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/win32/php_stdbool.h b/win32/php_stdbool.h index 83c808f60e..cc853c59c1 100644 --- a/win32/php_stdbool.h +++ b/win32/php_stdbool.h @@ -1,11 +1,11 @@ -#ifndef _STDBOOL_H
-#define _STDBOOL_H
-#if !defined(__BOOL_DEFINED)
-# define bool short
-
-/* The other macros must be usable in preprocessor directives. */
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
-# endif
-#endif /* _STDBOOL_H */
+#ifndef _STDBOOL_H +#define _STDBOOL_H +#if !defined(__BOOL_DEFINED) +# define bool short + +/* The other macros must be usable in preprocessor directives. */ +# define false 0 +# define true 1 +# define __bool_true_false_are_defined 1 +# endif +#endif /* _STDBOOL_H */ |