diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 20:27:52 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 20:27:52 +0000 |
commit | bd82f4cf5d16f70111bf49840a3eb52b3456bac1 (patch) | |
tree | 21741bf948a9e7277012670e8f6bc162fd164153 /lib | |
parent | 03d22a22df852e464d0ec8bb9bfaebdecfcbdadd (diff) |
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
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |