1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do

not test ruby/ruby.h, which makes OS X's gcc pick the wrong
  header file from Ruby.framework.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-07-15 12:48:47 +00:00
parent c9eba6932b
commit e3cc2ee1ed
4 changed files with 9 additions and 5 deletions

View file

@ -1,3 +1,9 @@
Tue Jul 15 21:45:41 2008 Akinori MUSHA <knu@iDaemons.org>
* ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do
not test ruby/ruby.h, which makes OS X's gcc pick the wrong
header file from Ruby.framework.
Tue Jul 15 21:31:26 2008 Akinori MUSHA <knu@iDaemons.org>
* configure.in (--with-ruby-version): Add a new option to specify

View file

@ -5,7 +5,7 @@ require 'mkmf'
is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ RUBY_PLATFORM)
#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
have_header("ruby/ruby.h")
have_header("ruby/signal.h")
have_header("ruby/encoding.h")
have_func("ruby_native_thread_p", "ruby.h")
have_func("rb_errinfo", "ruby.h")

View file

@ -8,8 +8,7 @@
#include "ruby.h"
#ifdef HAVE_RUBY_RUBY_H
/* #include "ruby/ruby.h" */
#ifdef HAVE_RUBY_SIGNAL_H
#include "ruby/signal.h"
#ifdef HAVE_RUBY_ENCODING_H
#include "ruby/encoding.h"

View file

@ -11,8 +11,7 @@
#include "ruby.h"
#ifdef HAVE_RUBY_RUBY_H
/* #include "ruby/ruby.h" */
#ifdef HAVE_RUBY_SIGNAL_H
#include "ruby/signal.h"
#include "ruby/st.h"
#else