diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-01 03:08:57 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-01 03:08:57 +0000 |
| commit | 4d17e7e7c5dec2d055cf96b9c4a5fa457fdef772 (patch) | |
| tree | 4e10e6338d55fe67bfcbc5a971a1dab14481f94f /include/sys/time.h | |
| parent | 0600b878cde4e363436e51833393463e715e2f04 (diff) | |
| download | uClibc-alpine-4d17e7e7c5dec2d055cf96b9c4a5fa457fdef772.tar.bz2 uClibc-alpine-4d17e7e7c5dec2d055cf96b9c4a5fa457fdef772.tar.xz | |
Mini-merge from trunk. Not as fun as a Mini Cooper, but oh well.
Diffstat (limited to 'include/sys/time.h')
| -rw-r--r-- | include/sys/time.h | 31 |
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 |