From 9187f1c193767b7a09a2d9ef8e72f6f0dabd3250 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 25 Sep 2022 16:38:19 +0200 Subject: [PATCH] stdbool: Mostly revert last patch. * m4/c-bool.m4 (gl_C_BOOL): If stdbool.h does not exist, just err out. * modules/stdbool (Files): Remove m4/stdbool.m4. --- ChangeLog | 7 +++++++ m4/c-bool.m4 | 40 +++++----------------------------------- modules/stdbool | 1 - 3 files changed, 12 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c54eabb49..24553445f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +2022-09-25 Bruno Haible + + stdbool: Mostly revert last patch. + * m4/c-bool.m4 (gl_C_BOOL): If stdbool.h does not exist, just err out. + * modules/stdbool (Files): Remove m4/stdbool.m4. + 2022-09-24 Bruno Haible stdbool: Don't #include a gnulib-generated stdbool.h from config.h. * m4/c-bool.m4 (gl_C_BOOL): Check for stdbool.h and for _Bool. If stdbool.h does not exist, don't #include but instead put the substitute code into config.h. + * modules/stdbool (Files): Add m4/stdbool.m4. 2022-09-24 Bruno Haible diff --git a/m4/c-bool.m4 b/m4/c-bool.m4 index 129981d2f7..bb109b7796 100644 --- a/m4/c-bool.m4 +++ b/m4/c-bool.m4 @@ -23,8 +23,6 @@ AC_DEFUN([gl_C_BOOL], fi AC_CHECK_HEADERS_ONCE([stdbool.h]) - AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) - AC_DEFINE_UNQUOTED([HAVE__BOOL],[$HAVE__BOOL]) dnl The "zz" puts this toward config.h's end, to avoid potential dnl collisions with other definitions. @@ -39,39 +37,11 @@ AC_DEFUN([gl_C_BOOL], # if HAVE_STDBOOL_H # include # else - /* Substitute. Keep consistent with gnulib/lib/stdbool.in.h. */ -# ifndef _GL_STDBOOL_H -# define _GL_STDBOOL_H -# ifdef __cplusplus -# if !defined _MSC_VER -# define _Bool bool -# define bool bool -# endif -# else -# if !defined __GNUC__ -# define _Bool signed char -# else -# if !HAVE__BOOL -typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; -# endif -# endif -# define bool _Bool -# endif -# ifdef __cplusplus -# if !defined _MSC_VER -# define false false -# define true true -# endif -# if defined __SUNPRO_CC && true != 1 -# undef true -# define true (!false) -# endif -# else -# define false 0 -# define true 1 -# endif -# define __bool_true_false_are_defined 1 -# endif /* _GL_STDBOOL_H */ +# if defined __SUNPRO_C +# error " is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." +# else +# error " does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." +# endif # endif # endif # if !true diff --git a/modules/stdbool b/modules/stdbool index 664df5e0f8..2e771a2336 100644 --- a/modules/stdbool +++ b/modules/stdbool @@ -3,7 +3,6 @@ A bool that is like C23. Files: m4/c-bool.m4 -m4/stdbool.m4 Depends-on: c99 -- 2.39.5