From 916fff3b6133b16118ccedad56d993e8579ce867 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 11 Oct 2014 13:33:27 +0000 Subject: [PATCH] * file.c (HAVE_UTIMENSAT): disabled for NativeClient. Fixes build error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fb0364b1b..26b1d82514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 11 22:29:40 2014 Yuki Yugui Sonoda + + * file.c (HAVE_UTIMENSAT): disabled for NativeClient. + Fixes build error. + Sat Oct 11 22:11:58 2014 Yuki Yugui Sonoda * ext/extmk.rb: generates the rule for extinit.$(OBJEXT). diff --git a/file.c b/file.c index 3a960d7c93..c9b062e4df 100644 --- a/file.c +++ b/file.c @@ -64,10 +64,14 @@ int flock(int, int); #include #include -#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 pathv, void *arg) 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) {