summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-29 02:44:37 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-29 02:44:37 +0000
commitdc2f8b7df345a98e035b4616a85c8876174503a1 (patch)
tree536242ea45dc9d606e00ed3f9b6efe4e1ff377e7 /lib
parent2ceb166fbb9e9765c9c2c2ea0669541103fbcc1e (diff)
downloadruby-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
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb7
1 files changed, 6 insertions, 1 deletions
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)