diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 12:58:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-15 12:58:23 +0000 |
| commit | 42172d16f06cd6c2edd606fc377896e24a0e0bf6 (patch) | |
| tree | 614069c56a1aaa800ba5faaea46a8878b191a7ec | |
| parent | 2ca19b21e1dad5fbad12ef92c4bdcfa9ed76a056 (diff) | |
| download | ruby-42172d16f06cd6c2edd606fc377896e24a0e0bf6.tar.gz ruby-42172d16f06cd6c2edd606fc377896e24a0e0bf6.tar.xz ruby-42172d16f06cd6c2edd606fc377896e24a0e0bf6.zip | |
* ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be
checked.
* ext/tk/{tcltklib.c,tkutil/tkutil.c}: check macros for each headers.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 7 | ||||
| -rw-r--r-- | ext/tk/tkutil/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/tk/tkutil/tkutil.c | 7 |
5 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Tue Jul 15 21:58:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be + checked. + + * ext/tk/{tcltklib.c,tkutil/tkutil.c}: check macros for each headers. + 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 diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index ec0a12eac..be3781251 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -5,8 +5,6 @@ require 'mkmf' is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ RUBY_PLATFORM) #is_macosx = (/darwin/ =~ RUBY_PLATFORM) -have_header("ruby/signal.h") -have_header("ruby/encoding.h") have_func("ruby_native_thread_p", "ruby.h") have_func("rb_errinfo", "ruby.h") have_func("rb_safe_level", "ruby.h") diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index db31846e6..00a3256a8 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -10,12 +10,13 @@ #ifdef HAVE_RUBY_SIGNAL_H #include "ruby/signal.h" +#else +#include "rubysig.h" +#endif #ifdef HAVE_RUBY_ENCODING_H #include "ruby/encoding.h" #endif -#else -/* #include "ruby.h" */ -#include "rubysig.h" +#ifndef HAVE_RUBY_RUBY_H #include "version.h" #endif diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb index ed5de0ee6..34b91632e 100644 --- a/ext/tk/tkutil/extconf.rb +++ b/ext/tk/tkutil/extconf.rb @@ -7,7 +7,6 @@ end if has_tk require 'mkmf' - have_header("ruby/ruby.h") have_func("rb_obj_instance_exec", "ruby.h") have_func("rb_sym_to_s", "ruby.h") have_func("strndup", "string.h") diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index 98197ee7b..6f35e195d 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -13,11 +13,12 @@ #ifdef HAVE_RUBY_SIGNAL_H #include "ruby/signal.h" -#include "ruby/st.h" #else -/* #include "ruby.h" */ #include "rubysig.h" -#include "version.h" +#endif +#ifdef HAVE_RUBY_ST_H +#include "ruby/st.h" +#else #include "st.h" #endif |