From 99b0ab09036e16ad845438938d9b607f2d3f346a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 4 Sep 2022 16:24:56 +0200 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ lib/stdbool.in.h | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 935d1b156b..5799cfef35 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 2fa46724b2..36f26560af 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -59,8 +59,10 @@ /* 7.16. Boolean type and values */ #ifdef __cplusplus -# define _Bool bool -# define bool bool +# if !defined _MSC_VER +# define _Bool bool +# define bool bool +# endif #else # if !defined __GNUC__ /* If @HAVE__BOOL@: @@ -103,8 +105,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 -- 2.39.5