RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-29 21:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move utimensat definition into timespec section.

Browse Source 
Since utimensat uses struct timespec, move it to the section where we
define struct timespec when needed.
This commit is contained in:
Darren Tucker 2019-10-28 16:00:45 +11:00
parent 850ec1773d
commit 7169e31121
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openbsd-compat/bsd-misc.h
View File

@ -64,14 +64,6 @@ struct timeval {
int utimes(char *, struct timeval *); int utimes(char *, struct timeval *);
#endif /* HAVE_UTIMES */ #endif /* HAVE_UTIMES */
#ifndef HAVE_UTIMENSAT
/* start with the high bits and work down to minimise risk of overlap */
# ifndef AT_SYMLINK_NOFOLLOW
# define AT_SYMLINK_NOFOLLOW 0x80000000
# endif
int utimensat(int, const char *, const struct timespec[2], int);
#endif
#ifndef AT_FDCWD #ifndef AT_FDCWD
# define AT_FDCWD (-2) # define AT_FDCWD (-2)
#endif #endif
@ -88,16 +80,26 @@ int fchownat(int, const char *, uid_t, gid_t, int);
int truncate (const char *, off_t); int truncate (const char *, off_t);
#endif /* HAVE_TRUNCATE */ #endif /* HAVE_TRUNCATE */
#if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP)
#ifndef HAVE_STRUCT_TIMESPEC #ifndef HAVE_STRUCT_TIMESPEC
struct timespec { struct timespec {
time_t tv_sec; time_t tv_sec;
long tv_nsec; long tv_nsec;
}; };
#endif
#if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP)
int nanosleep(const struct timespec *, struct timespec *); int nanosleep(const struct timespec *, struct timespec *);
#endif #endif
#ifndef HAVE_UTIMENSAT
/* start with the high bits and work down to minimise risk of overlap */
# ifndef AT_SYMLINK_NOFOLLOW
# define AT_SYMLINK_NOFOLLOW 0x80000000
# endif
int utimensat(int, const char *, const struct timespec[2], int);
#endif /* !HAVE_UTIMENSAT */
#endif /* !HAVE_STRUCT_TIMESPEC */
#ifndef HAVE_USLEEP #ifndef HAVE_USLEEP
int usleep(unsigned int useconds); int usleep(unsigned int useconds);
#endif #endif