diff options
| -rw-r--r-- | internal.h | 14 | ||||
| -rw-r--r-- | missing/stdbool.h | 22 |
2 files changed, 13 insertions, 23 deletions
diff --git a/internal.h b/internal.h index b51037e0dc..c6cf73bf10 100644 --- a/internal.h +++ b/internal.h @@ -23,18 +23,8 @@ extern "C" { #ifdef HAVE_STDBOOL_H # include <stdbool.h> -#endif - -#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 +#else +# include "missing/stdbool.h" #endif /* The most significant bit of the lower part of half-long integer. diff --git a/missing/stdbool.h b/missing/stdbool.h index 68c2f3d254..f370e01e92 100644 --- a/missing/stdbool.h +++ b/missing/stdbool.h @@ -5,16 +5,16 @@ #ifndef _MISSING_STDBOOL_H_ #define _MISSING_STDBOOL_H_ -#ifndef __cplusplus - -#define bool _Bool -#define true 1 -#define false 0 - -#ifndef HAVE__BOOL /* AC_HEADER_STDBOOL in configure.ac */ -typedef int _Bool; -#endif /* HAVE__BOOL */ - -#endif /* __cplusplus */ +#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_ */ |