Changeset 3140 for trunk/src/kmk/kmkbuiltin/mscfakes.h

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• kmkbuiltin/mscfakes.h (modified) (2 diffs)

trunk/src/kmk/kmkbuiltin/mscfakes.h

@@ -110 +110 @@
 #endif
 
-struct timeval
+struct msc_timeval
 {
     __time64_t tv_sec;
     long tv_usec;
 };
+#define timeval msc_timeval
 
 struct iovec
@@ -160 +161 @@
 #endif
 int symlink(const char *pszDst, const char *pszLink);
-int utimes(const char *pszPath, const struct timeval *paTimes);
-int lutimes(const char *pszPath, const struct timeval *paTimes);
+int utimes(const char *pszPath, const struct msc_timeval *paTimes);
+int lutimes(const char *pszPath, const struct msc_timeval *paTimes);
 ssize_t writev(int fd, const struct iovec *vector, int count);
 
-int gettimeofday(struct timeval *pNow, void *pvIgnored);
+int gettimeofday(struct msc_timeval *pNow, void *pvIgnored);
 struct tm *localtime_r(const __time64_t *pNow, struct tm *pResult);
 __time64_t timegm(struct tm *pNow);