Changeset 3140 in kBuild for trunk/src/kmk/kmkbuiltin/mscfakes.c

Timestamp:

Mar 14, 2018 9: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.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -44 +44 @@
 #undef utimes
 #undef lutimes
-
-#define timeval windows_timeval
-#include <Windows.h>
-#undef timeval
 
 extern ssize_t maybe_con_write(int, void const *, size_t);
@@ -662 +658 @@
 
 
-int utimes(const char *pszPath, const struct timeval *paTimes)
+int utimes(const char *pszPath, const struct msc_timeval *paTimes)
 {
     if (paTimes)
@@ -677 +673 @@
 
 
-int lutimes(const char *pszPath, const struct timeval *paTimes)
+int lutimes(const char *pszPath, const struct msc_timeval *paTimes)
 {
     if (paTimes)
@@ -692 +688 @@
 
 
-int gettimeofday(struct timeval *pNow, void *pvIgnored)
+int gettimeofday(struct msc_timeval *pNow, void *pvIgnored)
 {
     struct __timeb64 Now;