nobu	2008-07-15 21:58:23 +0900 (Tue, 15 Jul 2008)

  New Revision: 18079

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18079

  Log:
    * 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.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/tk/extconf.rb
    branches/ruby_1_8/ext/tk/tcltklib.c
    branches/ruby_1_8/ext/tk/tkutil/extconf.rb
    branches/ruby_1_8/ext/tk/tkutil/tkutil.c
    trunk/ChangeLog
    trunk/ext/tk/extconf.rb
    trunk/ext/tk/tcltklib.c
    trunk/ext/tk/tkutil/extconf.rb
    trunk/ext/tk/tkutil/tkutil.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18078)
+++ ChangeLog	(revision 18079)
@@ -1,3 +1,10 @@
+Tue Jul 15 21:58:20 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@i...>
 
 	* ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do
Index: ext/tk/tcltklib.c
===================================================================
--- ext/tk/tcltklib.c	(revision 18078)
+++ ext/tk/tcltklib.c	(revision 18079)
@@ -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
 
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 18078)
+++ ext/tk/extconf.rb	(revision 18079)
@@ -5,8 +5,6 @@
 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")
Index: ext/tk/tkutil/extconf.rb
===================================================================
--- ext/tk/tkutil/extconf.rb	(revision 18078)
+++ ext/tk/tkutil/extconf.rb	(revision 18079)
@@ -7,7 +7,6 @@
 
 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")
Index: ext/tk/tkutil/tkutil.c
===================================================================
--- ext/tk/tkutil/tkutil.c	(revision 18078)
+++ ext/tk/tkutil/tkutil.c	(revision 18079)
@@ -13,11 +13,12 @@
 
 #ifdef HAVE_RUBY_SIGNAL_H
 #include "ruby/signal.h"
+#else
+#include "rubysig.h"
+#endif
+#ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
 #else
-/* #include "ruby.h" */
-#include "rubysig.h"
-#include "version.h"
 #include "st.h"
 #endif
 
Index: ruby_1_8/ext/tk/tcltklib.c
===================================================================
--- ruby_1_8/ext/tk/tcltklib.c	(revision 18078)
+++ ruby_1_8/ext/tk/tcltklib.c	(revision 18079)
@@ -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
 
Index: ruby_1_8/ext/tk/extconf.rb
===================================================================
--- ruby_1_8/ext/tk/extconf.rb	(revision 18078)
+++ ruby_1_8/ext/tk/extconf.rb	(revision 18079)
@@ -5,8 +5,6 @@
 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")
Index: ruby_1_8/ext/tk/tkutil/extconf.rb
===================================================================
--- ruby_1_8/ext/tk/tkutil/extconf.rb	(revision 18078)
+++ ruby_1_8/ext/tk/tkutil/extconf.rb	(revision 18079)
@@ -7,7 +7,6 @@
 
 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")
Index: ruby_1_8/ext/tk/tkutil/tkutil.c
===================================================================
--- ruby_1_8/ext/tk/tkutil/tkutil.c	(revision 18078)
+++ ruby_1_8/ext/tk/tkutil/tkutil.c	(revision 18079)
@@ -13,11 +13,12 @@
 
 #ifdef HAVE_RUBY_SIGNAL_H
 #include "ruby/signal.h"
+#else
+#include "rubysig.h"
+#endif
+#ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
 #else
-/* #include "ruby.h" */
-#include "rubysig.h"
-#include "version.h"
 #include "st.h"
 #endif
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18078)
+++ ruby_1_8/ChangeLog	(revision 18079)
@@ -1,3 +1,10 @@
+Tue Jul 15 21:58:20 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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:49:21 2008  Akinori MUSHA  <knu@i...>
 
 	* ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/