nobu	2009-01-23 14:34:49 +0900 (Fri, 23 Jan 2009)

  New Revision: 21748

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

  Log:
    * lib/mkmf.rb (try_func): got rid of c-mode confusion.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21747)
+++ ChangeLog	(revision 21748)
@@ -1,3 +1,7 @@
+Fri Jan 23 14:36:06 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (try_func): got rid of c-mode confusion.
+
 Fri Jan 23 13:26:45 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* signal.c (trap_handler): also accepts symbols.  [ruby-dev:37823]
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 21747)
+++ lib/mkmf.rb	(revision 21748)
@@ -524,12 +524,13 @@
 
 def try_func(func, libs, headers = nil, &b)
   headers = cpp_include(headers)
-  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+  try_link(<<"SRC", libs, &b) or
 #{headers}
 /*top*/
 #{MAIN_DOES_NOTHING}
 int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+  try_link(<<"SRC", libs, &b)
 #{headers}
 /*top*/
 #{MAIN_DOES_NOTHING}
@@ -1316,11 +1317,7 @@
 SHELL = /bin/sh
 
 #### Start of system configuration section. ####
-#{
-if $extmk
-  "top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
-end
-}
+#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
 srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
 topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
 hdrdir = #{CONFIG["hdrdir"].quote}
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 21747)
+++ ruby_1_8/ChangeLog	(revision 21748)
@@ -1,3 +1,7 @@
+Fri Jan 23 14:36:06 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (try_func): got rid of c-mode confusion.
+
 Thu Jan 22 12:19:29 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (define_final): cannot define finalizer for immediate
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 21747)
+++ ruby_1_8/version.h	(revision 21748)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-22"
+#define RUBY_RELEASE_DATE "2009-01-23"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090122
+#define RUBY_RELEASE_CODE 20090123
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 23
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 21747)
+++ ruby_1_8/lib/mkmf.rb	(revision 21748)
@@ -476,12 +476,13 @@
 
 def try_func(func, libs, headers = nil, &b)
   headers = cpp_include(headers)
-  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+  try_link(<<"SRC", libs, &b) or
 #{headers}
 /*top*/
 #{MAIN_DOES_NOTHING}
 int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+  try_link(<<"SRC", libs, &b)
 #{headers}
 /*top*/
 #{MAIN_DOES_NOTHING}
@@ -1258,11 +1259,7 @@
 SHELL = /bin/sh
 
 #### Start of system configuration section. ####
-#{
-if $extmk
-  "top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
-end
-}
+#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
 srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
 topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
 hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}

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