diff options
| -rw-r--r-- | addr2line.c | 6 | ||||
| -rw-r--r-- | internal/stdbool.h | 16 | ||||
| -rw-r--r-- | missing/stdbool.h | 20 |
3 files changed, 16 insertions, 26 deletions
diff --git a/addr2line.c b/addr2line.c index 635194b96b..c6704858a9 100644 --- a/addr2line.c +++ b/addr2line.c @@ -25,11 +25,7 @@ #include <libproc.h> #endif -#ifdef HAVE_STDBOOL_H -#include <stdbool.h> -#else -#include "missing/stdbool.h" -#endif +#include "internal/stdbool.h" #if defined(USE_ELF) || defined(HAVE_MACH_O_LOADER_H) diff --git a/internal/stdbool.h b/internal/stdbool.h index 4c103b43ce..e090e575e7 100644 --- a/internal/stdbool.h +++ b/internal/stdbool.h @@ -13,8 +13,22 @@ #ifdef HAVE_STDBOOL_H # include <stdbool.h> +#endif + +/* Note that we assume the compiler isn't C++. */ +#ifdef __bool_true_false_are_defined +# undef bool +# undef true +# undef false +# undef __bool_true_false_are_defined #else -# include "missing/stdbool.h" +typedef unsigned char _Bool; #endif +/* See also http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2229.htm */ +#define bool _Bool +#define true ((_Bool)+1) +#define false ((_Bool)+0) +#define __bool_true_false_are_defined + #endif /* INTERNAL_STDBOOL_H */ diff --git a/missing/stdbool.h b/missing/stdbool.h deleted file mode 100644 index f370e01e92..0000000000 --- a/missing/stdbool.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * missing/stdbool.h: Quick alternative of C99 stdbool.h - */ - -#ifndef _MISSING_STDBOOL_H_ -#define _MISSING_STDBOOL_H_ - -#ifndef __bool_true_false_are_defined -# ifndef __cplusplus -# undef bool -# undef false -# undef true -# define bool signed char -# define false 0 -# define true 1 -# define __bool_true_false_are_defined 1 -# endif -#endif - -#endif /* _MISSING_STDBOOL_H_ */ |