diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-13 08:04:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-13 08:04:11 +0000 |
| commit | 07fb6dd3614d49124cbb51a42d45a3ba6b6f01fd (patch) | |
| tree | 856b4d5e92493317904d03f25eb8576cb4ede103 | |
| parent | 5c95e1c336025ba7f6a85931130013e53ae90324 (diff) | |
| download | ruby-07fb6dd3614d49124cbb51a42d45a3ba6b6f01fd.tar.gz ruby-07fb6dd3614d49124cbb51a42d45a3ba6b6f01fd.tar.xz ruby-07fb6dd3614d49124cbb51a42d45a3ba6b6f01fd.zip | |
* include/ruby/ruby.h (bool): not define to get rid of conflict
against curses.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 26 |
2 files changed, 8 insertions, 25 deletions
@@ -1,3 +1,8 @@ +Fri Mar 13 17:04:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/ruby.h (bool): not define to get rid of conflic + against curses. + Fri Mar 13 16:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks. @@ -21,7 +26,7 @@ Fri Mar 13 15:10:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Mar 13 10:42:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in (AC_HEADER_DIRENT): added. + * configure.in (AC_HEADER_STDBOOL): added. * include/ruby/ruby.h (NUM2INT, rb_special_const_p): returns true and false instead of Qtrue and Qfalse for platforms where VALUE diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index b4a001168..301a68f90 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -309,28 +309,6 @@ enum ruby_special_consts { RUBY_SPECIAL_SHIFT = 8 }; -#if defined HAVE_STDBOOL_H -# include <stdbool.h> -#elif defined __cplusplus -typedef bool _Bool; -#else -# ifndef HAVE__BOOL -# define _Bool signed char -# endif -# ifndef bool -# define bool _Bool -# endif -# ifndef false -# define false 0 -# endif -# ifndef true -# define true 1 -# endif -# ifndef __bool_true_false_are_defined -# define __bool_true_false_are_defined 1 -# endif -#endif - #define Qfalse ((VALUE)RUBY_Qfalse) #define Qtrue ((VALUE)RUBY_Qtrue) #define Qnil ((VALUE)RUBY_Qnil) @@ -1171,8 +1149,8 @@ rb_type(VALUE obj) static inline int rb_special_const_p(VALUE obj) { - if (SPECIAL_CONST_P(obj)) return true; - return false; + if (SPECIAL_CONST_P(obj)) return (int)Qtrue; + return (int)Qfalse; } #include "ruby/missing.h" |