From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 26 Jan 2021 16:26:35 +0000 (+0100)
Subject: Cygwin: Align *utime*() with POSIX/glibc
X-Git-Tag: cygwin-3_2_0-release~79
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5b941f21b51d511e2dd853db51b521979d00454e;p=newlib-cygwin.git

Cygwin: Align *utime*() with POSIX/glibc

Followup to previous patch, this time matching definitions in Cygwin

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 4cc8d07f5..8bb6ebae7 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -4915,7 +4915,7 @@ utimensat (int dirfd, const char *pathname, const struct timespec *times,
 }
 
 extern "C" int
-futimesat (int dirfd, const char *pathname, const struct timeval *times)
+futimesat (int dirfd, const char *pathname, const struct timeval times[2])
 {
   tmp_pathbuf tp;
   __try
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index f9de35c52..60b29b323 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -385,7 +385,7 @@ error:
 
 /* utimes: POSIX/SUSv3 */
 extern "C" int
-utimes (const char *path, const struct timeval *tvp)
+utimes (const char *path, const struct timeval tvp[2])
 {
   path_conv win32 (path, PC_POSIX | PC_SYM_FOLLOW, stat_suffixes);
   struct timespec tmp[2];
@@ -394,7 +394,7 @@ utimes (const char *path, const struct timeval *tvp)
 
 /* BSD */
 extern "C" int
-lutimes (const char *path, const struct timeval *tvp)
+lutimes (const char *path, const struct timeval tvp[2])
 {
   path_conv win32 (path, PC_POSIX | PC_SYM_NOFOLLOW, stat_suffixes);
   struct timespec tmp[2];
@@ -403,7 +403,7 @@ lutimes (const char *path, const struct timeval *tvp)
 
 /* futimens: POSIX/SUSv4 */
 extern "C" int
-futimens (int fd, const struct timespec *tvp)
+futimens (int fd, const struct timespec tvp[2])
 {
   int res;
 
@@ -420,7 +420,7 @@ futimens (int fd, const struct timespec *tvp)
 
 /* BSD */
 extern "C" int
-futimes (int fd, const struct timeval *tvp)
+futimes (int fd, const struct timeval tvp[2])
 {
   struct timespec tmp[2];
   return futimens (fd,  timeval_to_timespec (tvp, tmp));