summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-30 17:07:06 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-30 17:07:06 +0000
commita2f6317acda69a8772b4db50196dfda186a4e6f0 (patch)
tree02f185a6b610162439abaf15f4bccae603eac161
parentd7e601f9f2f8423969df99bee3d572c4512716db (diff)
Sync w/ glibc
-rw-r--r--include/sys/time.h31
1 files changed, 25 insertions, 6 deletions
diff --git a/include/sys/time.h b/include/sys/time.h
index f051d58c4..66fb9e021 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994,96,97,98,99,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1994,1996-2002,2003,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -70,13 +70,14 @@ typedef void *__restrict __timezone_ptr_t;
NOTE: This form of timezone information is obsolete.
Use the functions and variables declared in <time.h> instead. */
extern int gettimeofday (struct timeval *__restrict __tv,
- __timezone_ptr_t __tz) __THROW;
+ __timezone_ptr_t __tz) __THROW __nonnull ((1));
#ifdef __USE_BSD
/* Set the current time of day and timezone information.
This call is restricted to the super-user. */
extern int settimeofday (__const struct timeval *__tv,
- __const struct timezone *__tz) __THROW;
+ __const struct timezone *__tz)
+ __THROW __nonnull ((1));
/* Adjust the current time of day by the amount in DELTA.
If OLDDELTA is not NULL, it is filled in with the amount
@@ -132,10 +133,28 @@ extern int setitimer (__itimer_which_t __which,
__const struct itimerval *__restrict __new,
struct itimerval *__restrict __old) __THROW;
-/* Change the access time of FILE to TVP[0] and
- the modification time of FILE to TVP[1]. */
+/* Change the access time of FILE to TVP[0] and the modification time of
+ FILE to TVP[1]. If TVP is a null pointer, use the current time instead.
+ Returns 0 on success, -1 on errors. */
extern int utimes (__const char *__file, __const struct timeval __tvp[2])
- __THROW;
+ __THROW __nonnull ((1));
+
+#if 0 /*def __USE_BSD*/
+/* Same as `utimes', but does not follow symbolic links. */
+extern int lutimes (__const char *__file, __const struct timeval __tvp[2])
+ __THROW __nonnull ((1));
+
+/* Same as `utimes', but takes an open file descriptor instead of a name. */
+extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW;
+#endif
+
+#if 0 /*def __USE_GNU*/
+/* Change the access time of FILE relative to FD to TVP[0] and the
+ modification time of FILE to TVP[1]. If TVP is a null pointer, use
+ the current time instead. Returns 0 on success, -1 on errors. */
+extern int futimesat (int __fd, __const char *__file,
+ __const struct timeval __tvp[2]) __THROW;
+#endif
#ifdef __USE_BSD