From: Richard Jones <rjones@centos5x32.home.annexia.org>
Date: Wed, 18 Nov 2009 16:01:23 +0000 (+0000)
Subject: fuse/RHEL: Don't require UTIME_{NOW,OMIT} to be defined.
X-Git-Tag: 1.0.80~101
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=83eb2cf2fddbe3e06f50c18d5e651853f8d86813;p=libguestfs.git

fuse/RHEL: Don't require UTIME_{NOW,OMIT} to be defined.

These macros don't exist on RHEL/CentOS 5.4.  If the feature
is missing then just don't implement it in the FUSE layer.
---

diff --git a/fuse/guestmount.c b/fuse/guestmount.c
index baf2b66..05cacef 100644
--- a/fuse/guestmount.c
+++ b/fuse/guestmount.c
@@ -534,14 +534,22 @@ fg_utimens (const char *path, const struct timespec ts[2])
   time_t mtsecs = ts[1].tv_sec;
   long mtnsecs = ts[1].tv_nsec;
 
+#ifdef UTIME_NOW
   if (atnsecs == UTIME_NOW)
     atnsecs = -1;
+#endif
+#ifdef UTIME_OMIT
   if (atnsecs == UTIME_OMIT)
     atnsecs = -2;
+#endif
+#ifdef UTIME_NOW
   if (mtnsecs == UTIME_NOW)
     mtnsecs = -1;
+#endif
+#ifdef UTIME_OMIT
   if (mtnsecs == UTIME_OMIT)
     mtnsecs = -2;
+#endif
 
   r = guestfs_utimens (g, path, atsecs, atnsecs, mtsecs, mtnsecs);
   if (r == -1)