knu	2008-07-15 21:48:47 +0900 (Tue, 15 Jul 2008)

  New Revision: 18076

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

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

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18075)
+++ ChangeLog	(revision 18076)
@@ -1,3 +1,9 @@
+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
+	  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@i...>
 
 	* configure.in (--with-ruby-version): Add a new option to specify
Index: ext/tk/tcltklib.c
===================================================================
--- ext/tk/tcltklib.c	(revision 18075)
+++ ext/tk/tcltklib.c	(revision 18076)
@@ -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"
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 18075)
+++ ext/tk/extconf.rb	(revision 18076)
@@ -5,7 +5,7 @@
 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")
Index: ext/tk/tkutil/tkutil.c
===================================================================
--- ext/tk/tkutil/tkutil.c	(revision 18075)
+++ ext/tk/tkutil/tkutil.c	(revision 18076)
@@ -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

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