From bd82f4cf5d16f70111bf49840a3eb52b3456bac1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 20:27:52 +0000 Subject: merge revision(s) 14222:14225: * configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined and its type. * configure.in (timezone, altzone): check for recent cygwin. * missing/strftime.c (strftime): fix for timezone. [ruby-dev:32536] * lib/mkmf.rb (try_var): should fail for functions. * ext/readline/extconf.rb: should use have_func for functions instead of have_var. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/mkmf.rb') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3e80cb0240..31f4878b8b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -438,7 +438,7 @@ def try_var(var, headers = nil, &b) #{headers} /*top*/ int main() { return 0; } -int t() { const volatile void *volatile p; p = (void *)&#{var}; return 0; } +int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; } SRC end -- cgit v1.2.3