Skip to content

Commit

Permalink
internal.h: unify our own stdtbool.h implementation
Browse files Browse the repository at this point in the history
because we had another one in missing/stdbool.h as well.
Assuming that _Bool does not exist when stdbool.h is absent, I'm in
favor of r57462 implementation rather than r61326.

Note that Visual Studio 2013 has stdbool.h and thus r57462's commit
message is somewhat misleading. This missing/stdbool.h is for Visual
Studio 2012 or older, and for Oracle Solaris Studio 12.2 or older because
it's added in 12.3 https://docs.oracle.com/cd/E24457_01/html/E21987/gkeza.html.

missing/stdbool.h: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
k0kubun committed Jan 6, 2019
1 parent d9699fa commit d893125
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 23 deletions.
14 changes: 2 additions & 12 deletions internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
22 changes: 11 additions & 11 deletions missing/stdbool.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

0 comments on commit d893125

Please sign in to comment.