diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-29 02:44:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-29 02:44:37 +0000 |
| commit | dc2f8b7df345a98e035b4616a85c8876174503a1 (patch) | |
| tree | 536242ea45dc9d606e00ed3f9b6efe4e1ff377e7 | |
| parent | 2ceb166fbb9e9765c9c2c2ea0669541103fbcc1e (diff) | |
| download | ruby-dc2f8b7df345a98e035b4616a85c8876174503a1.tar.gz ruby-dc2f8b7df345a98e035b4616a85c8876174503a1.tar.xz ruby-dc2f8b7df345a98e035b4616a85c8876174503a1.zip | |
* lib/mkmf.rb (try_func): revert fallback checking undeclared function.
fixed: [ruby-core:08949]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -1,6 +1,11 @@ +Fri Sep 29 11:43:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (try_func): revert fallback checking undeclared function. + fixed: [ruby-core:08949] + Fri Sep 29 10:59:16 2006 WATANABE Hirofumi <eban@ruby-lang.org> - * 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 <nobu@ruby-lang.org> diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0e2b5829a..1e8033b91 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) |