diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-23 05:34:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-23 05:34:49 +0000 |
| commit | 1190cc82ca62b89dd91722136b7b6b2ae6a448d5 (patch) | |
| tree | a090b85ca2a9d7a2bff1645e8cb231e934f9b4e4 | |
| parent | 3ec5526268411bbe26b11e8e5f498558825f76c8 (diff) | |
* lib/mkmf.rb (try_func): got rid of c-mode confusion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@21748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 9 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 9 deletions
@@ -1,3 +1,7 @@ +Fri Jan 23 14:36:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (try_func): got rid of c-mode confusion. + Thu Jan 22 12:19:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * gc.c (define_final): cannot define finalizer for immediate diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c5f3ccfc1f..28c9dc44d8 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -476,12 +476,13 @@ end 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 @@ def configuration(srcdir) 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)'} @@ -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[]; |