X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsettime.c;h=04f241d08db9569a8039bb14511d58bc53f499bc;hb=ab624c1a8f744419fdb653b77250153a3563203f;hp=4b9111a208641eaed230ca9cf269ee902658d82e;hpb=e244e99d0442904e9f351ca14a7fca128f7ca3c6;p=gnulib.git
diff --git a/lib/settime.c b/lib/settime.c
index 4b9111a20..04f241d08 100644
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -1,10 +1,11 @@
/* settime -- set the system clock
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2002, 2004-2007, 2009-2012 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,33 +13,19 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "timespec.h"
-#if HAVE_UNISTD_H
-# include
-#endif
+#include
+#include
#include
-/* Some systems don't have ENOSYS. */
-#ifndef ENOSYS
-# ifdef ENOTSUP
-# define ENOSYS ENOTSUP
-# else
-/* Some systems don't have ENOTSUP either. */
-# define ENOSYS EINVAL
-# endif
-#endif
-
/* Set the system time. */
int
@@ -55,17 +42,15 @@ settime (struct timespec const *ts)
#if HAVE_SETTIMEOFDAY
{
struct timeval tv;
- int r;
tv.tv_sec = ts->tv_sec;
tv.tv_usec = ts->tv_nsec / 1000;
- r = settimeofday (&tv, 0);
- if (r == 0 || errno == EPERM)
- return r;
+ return settimeofday (&tv, 0);
}
-#endif
-
-#if HAVE_STIME
+#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. */
return stime (&ts->tv_sec);
#else
errno = ENOSYS;