[前][次][番号順一覧][スレッド一覧]

ruby-changes:4281

From: ko1@a...
Date: Fri, 14 Mar 2008 10:14:08 +0900 (JST)
Subject: [ruby-changes:4281] nobu - Ruby:r15771 (ruby_1_8, trunk): * configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor

nobu	2008-03-14 10:12:32 +0900 (Fri, 14 Mar 2008)

  New Revision: 15771

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/configure.in

  Log:
    * configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
      directives.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=15771&r2=15770&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15771&r2=15770&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15771&r2=15770&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15771&r2=15770&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15771&r2=15770&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 15770)
+++ configure.in	(revision 15771)
@@ -707,17 +707,19 @@
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
 #endif
-    $2
-    const volatile void *volatile t;],
+$2
+;
+const volatile void *volatile t;],
     [t = &(&$1)[0];],
     [for t in $3; do
       AC_TRY_COMPILE([
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
 #endif
-        $2
-        extern $t $1;
-        const volatile void *volatile t;],
+$2
+;
+extern $t $1;
+const volatile void *volatile t;],
         [t = &(&$1)[0];],
         [rb_cv_var_$1=$t; break])
     done])])
@@ -725,13 +727,13 @@
   AC_DEFINE([HAVE_VAR_]m4_toupper($1))
   AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
 fi])
-RUBY_CHECK_VARTYPE(timezone, [#include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [#include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
 if test "$rb_cv_var_timezone" = no; then
   AC_CHECK_FUNCS(timezone)
   if test "$ac_cv_func_timezone" = yes; then
     AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-      [AC_TRY_COMPILE([#include <time.h>],
+      [AC_TRY_COMPILE([@%:@include <time.h>],
 	[(void)timezone(0, 0);],
 	[rb_cv_func_timezone_void=no],
 	[rb_cv_func_timezone_void=yes])]
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15770)
+++ ChangeLog	(revision 15771)
@@ -1,3 +1,8 @@
+Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
+	  directives.
+
 Fri Mar 14 10:03:59 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (UNALIGNED_WORD_ACCESS): IA64 cannot access unaligned word.
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 15770)
+++ ruby_1_8/configure.in	(revision 15771)
@@ -594,17 +594,19 @@
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
 #endif
-    $2
-    const volatile void *volatile t;],
+$2
+;
+const volatile void *volatile t;],
     [t = &(&$1)[0];],
     [for t in $3; do
       AC_TRY_COMPILE([
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
 #endif
-        $2
-        extern $t $1;
-        const volatile void *volatile t;],
+$2
+;
+extern $t $1;
+const volatile void *volatile t;],
         [t = &(&$1)[0];],
         [rb_cv_var_$1=$t; break])
     done])])
@@ -612,13 +614,13 @@
   AC_DEFINE([HAVE_VAR_]m4_toupper($1))
   AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
 fi])
-RUBY_CHECK_VARTYPE(timezone, [#include <time.h>], [long int])
-RUBY_CHECK_VARTYPE(altzone, [#include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
+RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
 if test "$rb_cv_var_timezone" = no; then
   AC_CHECK_FUNCS(timezone)
-  if test "$ ac_cv_func_timezone" = yes; then
+  if test "$ac_cv_func_timezone" = yes; then
     AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-      [AC_TRY_COMPILE([#include <time.h>],
+      [AC_TRY_COMPILE([@%:@include <time.h>],
 	[(void)timezone(0, 0);],
 	[rb_cv_func_timezone_void=no],
 	[rb_cv_func_timezone_void=yes])]
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15770)
+++ ruby_1_8/ChangeLog	(revision 15771)
@@ -1,3 +1,8 @@
+Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
+	  directives.
+
 Thu Mar 13 00:37:20 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_call0): yields the last executed node line number at
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15770)
+++ ruby_1_8/version.h	(revision 15771)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-03-13"
+#define RUBY_RELEASE_DATE "2008-03-14"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080313
+#define RUBY_RELEASE_CODE 20080314
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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

[前][次][番号順一覧][スレッド一覧]