1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/ruby/ruby.h (bool): not define to get rid of conflict

Browse Source 
against curses.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-13 08:04:11 +00:00
parent 1f46af14e4
commit b4bfc3aa79
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Fri Mar 13 16:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks. * 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> 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 * include/ruby/ruby.h (NUM2INT, rb_special_const_p): returns true
and false instead of Qtrue and Qfalse for platforms where VALUE and false instead of Qtrue and Qfalse for platforms where VALUE

26
include/ruby/ruby.h
View File

@ -309,28 +309,6 @@ enum ruby_special_consts {
RUBY_SPECIAL_SHIFT = 8 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 Qfalse ((VALUE)RUBY_Qfalse)
#define Qtrue ((VALUE)RUBY_Qtrue) #define Qtrue ((VALUE)RUBY_Qtrue)
#define Qnil ((VALUE)RUBY_Qnil) #define Qnil ((VALUE)RUBY_Qnil)
@ -1171,8 +1149,8 @@ rb_type(VALUE obj)
static inline int static inline int
rb_special_const_p(VALUE obj) rb_special_const_p(VALUE obj)
{ {
if (SPECIAL_CONST_P(obj)) return true; if (SPECIAL_CONST_P(obj)) return (int)Qtrue;
return false; return (int)Qfalse;
} }
#include "ruby/missing.h" #include "ruby/missing.h"