yugui	2014-10-11 22:33:27 +0900 (Sat, 11 Oct 2014)

  New Revision: 47884

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

  Log:
    * file.c (HAVE_UTIMENSAT): disabled for NativeClient.
      Fixes build error.

  Modified files:
    trunk/ChangeLog
    trunk/file.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47883)
+++ ChangeLog	(revision 47884)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct 11 22:29:40 2014  Yuki Yugui Sonoda  <yugui@y...>
+
+	* file.c (HAVE_UTIMENSAT): disabled for NativeClient.
+	  Fixes build error.
+
 Sat Oct 11 22:11:58 2014  Yuki Yugui Sonoda  <yugui@y...>
 
 	* ext/extmk.rb: generates the rule for extinit.$(OBJEXT).
Index: file.c
===================================================================
--- file.c	(revision 47883)
+++ file.c	(revision 47884)
@@ -64,10 +64,14 @@ int flock(int, int); https://github.com/ruby/ruby/blob/trunk/file.c#L64
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/utime.h"
-# include "nacl/stat.h"
-# include "nacl/unistd.h"
+#if defined(__native_client__) 
+# if defined(NACL_NEWLIB)
+#  include "nacl/utime.h"
+#  include "nacl/stat.h"
+#  include "nacl/unistd.h"
+# else
+#  undef HAVE_UTIMENSAT
+# endif
 #endif
 
 #ifdef HAVE_SYS_MKDEV_H
@@ -2538,7 +2542,7 @@ utime_internal(const char *path, VALUE p https://github.com/ruby/ruby/blob/trunk/file.c#L2542
     const struct timespec *tsp = v->tsp;
     struct timeval tvbuf[2], *tvp = NULL;
 
-#ifdef HAVE_UTIMENSAT
+#if defined(HAVE_UTIMENSAT)
     static int try_utimensat = 1;
 
     if (try_utimensat) {

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