From 33b113c638726bb3d68e5a5aa717fd05380c7a22 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 29 Sep 2005 13:13:49 +0000
Subject: (settime): Move the HAVE_STIME block `up' into an #elif block, so
 that we don't even try to compile it if settimeofday is available.  This
 works around a compilation failure on OSF1 V5.1, due to stime requiring a
 `long int*' while tv_sec is `int'.

---
 lib/settime.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/settime.c b/lib/settime.c
index 76bf70632..6fbee50f5 100644
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -61,12 +61,16 @@ settime (struct timespec const *ts)
     if (r == 0 || errno == EPERM)
       return r;
   }
+#elif HAVE_STIME
+  {
+    /* This fails to compile on OSF1 V5.1, due to stime requiring
+       a `long int*' and tv_sec is `int'.  But that system does provide
+       settimeofday.  */
+    int r = stime (&ts->tv_sec);
+    if (r == 0 || errno == EPERM)
+      return r;
 #endif
 
-#if HAVE_STIME
-  return stime (&ts->tv_sec);
-#else
   errno = ENOSYS;
   return -1;
-#endif
 }
-- 
cgit v1.2.3-70-g09d2