From: Bruno Haible Date: Sun, 4 Sep 2022 14:24:56 +0000 (+0200) Subject: stdbool: Fix compilation error in C++ mode with MSVC 14. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=5bbbee5fbb822bb1026e101c1aaafd63255225e7;p=gnulib.git stdbool: Fix compilation error in C++ mode with MSVC 14. * lib/stdbool.in.h (_Bool, bool, false, true): In C++ mode with MSVC 14, don't define these as macros. --- diff --git a/ChangeLog b/ChangeLog index 7727e3acc1..bfefa6f2bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-09-04 Bruno Haible + + stdbool: Fix compilation error in C++ mode with MSVC 14. + * lib/stdbool.in.h (_Bool, bool, false, true): In C++ mode with MSVC 14, + don't define these as macros. + 2022-09-04 Bruno Haible fts: Fix compilation error with MSVC 14. diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index 03840f10fc..b1613d4f02 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -67,8 +67,10 @@ #endif #ifdef __cplusplus -# define _Bool bool -# define bool bool +# if !defined _MSC_VER +# define _Bool bool +# define bool bool +# endif #else # if defined __BEOS__ && !defined __HAIKU__ /* A compiler known to have 'bool'. */ @@ -120,8 +122,10 @@ typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; /* The other macros must be usable in preprocessor directives. */ #ifdef __cplusplus -# define false false -# define true true +# if !defined _MSC_VER +# define false false +# define true true +# endif #else # define false 0 # define true 1