diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 12:48:47 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 12:48:47 +0000 |
| commit | 2ca19b21e1dad5fbad12ef92c4bdcfa9ed76a056 (patch) | |
| tree | 5495119227cd065451946e43d0aa1505dce2d6e3 | |
| parent | a592c2cbf7ab9779ac1e597dc1d4fa8f88ad69ad (diff) | |
| download | ruby-2ca19b21e1dad5fbad12ef92c4bdcfa9ed76a056.tar.gz ruby-2ca19b21e1dad5fbad12ef92c4bdcfa9ed76a056.tar.xz ruby-2ca19b21e1dad5fbad12ef92c4bdcfa9ed76a056.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@18076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 3 | ||||
| -rw-r--r-- | ext/tk/tkutil/tkutil.c | 3 |
4 files changed, 9 insertions, 5 deletions
@@ -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 diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 7762b2a06..ec0a12eac 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -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") diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 9e14fc4f8..db31846e6 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -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" diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index fb07efbc0..98197ee7b 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -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 |