diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-10-24 22:26:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-10-24 22:26:08 +0200 |
| commit | e97e0882ffc87a91e7818137196f1b74134566df (patch) | |
| tree | 285662381eaa0514f988142bff0c8a9685c84dc0 /lib/stdbool.mini.h | |
| parent | cc0876a2fa9e703b1064992ab535f3eed57e9c71 (diff) | |
| parent | cb4186bef1b44691db4221406d001a8d40c65b4b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/stdbool.mini.h')
| -rw-r--r-- | lib/stdbool.mini.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/stdbool.mini.h b/lib/stdbool.mini.h index 29736b7..7bdec72 100644 --- a/lib/stdbool.mini.h +++ b/lib/stdbool.mini.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2022 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software; you can redistribute it and/or modify @@ -96,8 +96,17 @@ /* 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 +/* In Sun C++ 5.11 (Solaris Studio 12.2) and older, 'true' as a preprocessor + expression evaluates to 0, not 1. Fix this by overriding 'true'. Note that + the replacement has to be of type 'bool'. */ +# if defined __SUNPRO_CC && true != 1 +# undef true +# define true (!false) +# endif #else # undef false # define false 0 |