X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsettime.c;h=cb91e8b8f3beff246ef2dbeef92f58fd16c106dc;hb=b4e5a5f11bd67ce5435b5ecf43b7fb6a81ba62a0;hp=76bf7063250823cfd13a25d64a493ee52a587feb;hpb=7c3f8da8f075e3813ced160d5b53a28c6f7dfe78;p=gnulib.git
diff --git a/lib/settime.c b/lib/settime.c
index 76bf70632..cb91e8b8f 100644
--- a/lib/settime.c
+++ b/lib/settime.c
@@ -1,10 +1,11 @@
/* settime -- set the system clock
- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2002, 2004-2007, 2009-2010 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,31 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "timespec.h"
+#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
@@ -53,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;