From d846e10d73bfaf64fbf4f42576d63392e34f9a2c Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Sep 2006 02:44:37 +0000 Subject: [PATCH] * lib/mkmf.rb (try_func): revert fallback checking undeclared function. fixed: [ruby-core:08949] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- lib/mkmf.rb | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59b2e43922..2ab4df943f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +Fri Sep 29 11:43:40 2006 Nobuyoshi Nakada + + * lib/mkmf.rb (try_func): revert fallback checking undeclared function. + fixed: [ruby-core:08949] + Fri Sep 29 10:59:16 2006 WATANABE Hirofumi - * lib/jcode.rb: need to initialize SUCC['n']. + * lib/jcode.rb: need to initialize SUCC['n']. fixed: [ruby-talk:216845] Fri Sep 29 09:56:56 2006 Nobuyoshi Nakada diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0e2b5829a5..1e8033b919 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -410,13 +410,18 @@ end def try_func(func, libs, headers = nil, &b) headers = cpp_include(headers) - try_link(<<"SRC", libs, &b) or macro_defined?(func, COMMON_HEADERS+headers, &b) + try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) #{COMMON_HEADERS} #{headers} /*top*/ int main() { return 0; } int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; } SRC +#{headers} +/*top*/ +int main() { return 0; } +int t() { #{func}(); return 0; } +SRC end def try_var(var, headers = nil, &b)