From 42172d16f06cd6c2edd606fc377896e24a0e0bf6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Jul 2008 12:58:23 +0000
Subject: * 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
---
 ext/tk/tkutil/extconf.rb | 1 -
 ext/tk/tkutil/tkutil.c   | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ext/tk/tkutil')

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
 
-- 
cgit