kazu	2014-05-01 22:25:40 +0900 (Thu, 01 May 2014)

  New Revision: 45774

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45774

  Log:
    * file.c: Change AND condition to nested condition.

  Modified files:
    trunk/ChangeLog
    trunk/file.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 45773)
+++ ChangeLog	(revision 45774)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu May  1 22:19:34 2014  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* file.c: Change AND condition to nested condition.
+
 Thu May  1 00:36:26 2014  Naohisa Goto  <ngotogenome@g...>
 
 	* file.c (FSTATFS): check availability of struct statfs and
Index: file.c
===================================================================
--- file.c	(revision 45773)
+++ file.c	(revision 45774)
@@ -72,6 +72,9 @@ int flock(int, int); https://github.com/ruby/ruby/blob/trunk/file.c#L72
 #ifdef HAVE_STRUCT_STATFS
 typedef struct statfs statfs_t;
 #define STATFS(f, s) statfs((f), (s))
+# ifdef HAVE_FSTATFS
+#  define FSTATFS(f, s) fstatfs((f), (s))
+# endif
 #ifdef HAVE_STRUCT_STATFS_F_FSTYPENAME
 #define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
 #endif
@@ -81,6 +84,9 @@ typedef struct statfs statfs_t; https://github.com/ruby/ruby/blob/trunk/file.c#L84
 #elif defined(HAVE_STRUCT_STATVFS)
 typedef struct statvfs statfs_t;
 #define STATFS(f, s) statvfs((f), (s))
+# ifdef HAVE_FSTATVFS
+#  define FSTATFS(f, s) fstatvfs((f), (s))
+# endif
 #ifdef HAVE_STRUCT_STATVFS_F_FSTYPENAME
 #define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
 #endif
@@ -92,11 +98,6 @@ typedef struct statvfs statfs_t; https://github.com/ruby/ruby/blob/trunk/file.c#L98
 #endif
 #ifndef WITHOUT_STATFS
 static VALUE rb_statfs_new(const statfs_t *st);
-#if defined(HAVE_FSTATFS) && defined(HAVE_STRUCT_STATFS)
-#define FSTATFS(f, s) fstatfs((f), (s))
-#elif defined(HAVE_FSTATVFS) && defined(HAVE_STRUCT_STATVFS)
-#define FSTATFS(f, s) fstatvfs((f), (s))
-#endif
 #endif
 
 #if defined(__native_client__) && defined(NACL_NEWLIB)

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