nobu	2007-12-14 11:54:08 +0900 (Fri, 14 Dec 2007)

  New Revision: 14224

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/lib/mkmf.rb
    trunk/ChangeLog
    trunk/configure.in
    trunk/lib/mkmf.rb

  Log:
    * lib/mkmf.rb (try_var): should fail for functions.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=14224&r2=14223
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=14224&r2=14223
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14224&r2=14223
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14224&r2=14223
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=14224&r2=14223
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=14224&r2=14223

Index: configure.in
===================================================================
--- configure.in	(revision 14223)
+++ configure.in	(revision 14224)
@@ -639,13 +639,14 @@
   [rb_cv_var_$1=no
   AC_TRY_COMPILE([#define _XOPEN_SOURCE 1
     $2
-    void *t;],
+    const volatile void *volatile t;],
     [t = &(&$1)[0];],
     [for t in $3; do
       AC_TRY_COMPILE([#define _XOPEN_SOURCE 1
         $2
-        extern $t $1;],
-        [void *t = &(&$1)[0];],
+        extern $t $1;
+        const volatile void *volatile t;],
+        [t = &(&$1)[0];],
         [rb_cv_var_$1=$t; break])
     done])])
 if test "[$rb_cv_var_]$1" != no; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14223)
+++ ChangeLog	(revision 14224)
@@ -1,4 +1,4 @@
-Fri Dec 14 10:01:40 2007  Nobuyoshi Nakada  <nobu@r...>
+Fri Dec 14 11:54:06 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
 	  and its type.
@@ -7,6 +7,8 @@
 
 	* missing/strftime.c (strftime): fix for timezone.  [ruby-dev:32536]
 
+	* lib/mkmf.rb (try_var): should fail for functions.
+
 Fri Dec 14 08:17:24 2007  Tanaka Akira  <akr@f...>
 
 	* eval.c (rb_protect): restore root_jmpbuf even if proc exits by
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 14223)
+++ lib/mkmf.rb	(revision 14224)
@@ -478,7 +478,7 @@
 #{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
 
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 14223)
+++ ruby_1_8/configure.in	(revision 14224)
@@ -577,13 +577,14 @@
   [rb_cv_var_$1=no
   AC_TRY_COMPILE([#define _XOPEN_SOURCE 1
     $2
-    void *t;],
+    const volatile void *volatile t;],
     [t = &(&$1)[0];],
     [for t in $3; do
       AC_TRY_COMPILE([#define _XOPEN_SOURCE 1
         $2
-        extern $t $1;],
-        [void *t = &(&$1)[0];],
+        extern $t $1;
+        const volatile void *volatile t;],
+        [t = &(&$1)[0];],
         [rb_cv_var_$1=$t; break])
     done])])
 if test "[$rb_cv_var_]$1" != no; then
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14223)
+++ ruby_1_8/ChangeLog	(revision 14224)
@@ -1,4 +1,4 @@
-Fri Dec 14 10:01:40 2007  Nobuyoshi Nakada  <nobu@r...>
+Fri Dec 14 11:54:06 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
 	  and its type.
@@ -7,6 +7,8 @@
 
 	* missing/strftime.c (strftime): fix for timezone.  [ruby-dev:32536]
 
+	* lib/mkmf.rb (try_var): should fail for functions.
+
 Tue Dec 11 00:04:05 2007  Akinori MUSHA  <knu@i...>
 
 	* array.c (rb_ary_slice_bang): If an invalid negative index (<
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 14223)
+++ ruby_1_8/lib/mkmf.rb	(revision 14224)
@@ -445,7 +445,7 @@
 #{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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml