Commit: aba8deb8b99df5cd66497e292856e63b66aada61 - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

Commit MetaInfo

• Revisão: aba8deb8b99df5cd66497e292856e63b66aada61 (tree)
• Hora: 2013-06-08 08:06:19
• Autor: Earnie Boyd <earnie@user...>
• Commiter: Earnie Boyd

Mensagem de Log

Miscellaneous changes toward finalizing the _USE_32BIT_TIME_T debacle.

Mudança Sumário

• modified: ChangeLog
• modified: include/_mingw.h
• modified: include/sys/stat.h
• modified: include/sys/utime.h
• modified: include/wchar.h

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
[phone]  Earnie Boyd  <[e-mail]>
+
+	* include/_mingw.h (_CRTALIAS): Add comments explaining its purpose.
+	(__CRT_MAYBE_INLINE): New macro that may be defined as __CRT_INLINE or
+	empty depending on __NO_INLINE__.
+	* include/stat.h (_fstat64i32(), _fstat32i64(), _stat64i32(),
+	_stat32i64(), _wstat64i32(), _wstat32i64()): Use __CRT_MAYBE_INLINE
+	instead of guarding with __NO_INLINE__ since the functions need to be
+	always created.
+	* include/wchar.h (_utimbuf, _utimbuf32, _utimbuf64, _wutime(),
+	_wutime32(), _wutime64()): MSDN declares these can be declared/defined
+	by including wchar.h.
+	* include/utime.h: Care for _USE_32BIT_TIME_T in same fashion as time.h.
+
+
 2013-06-07  Jan Nijtmans <[e-mail]>
 
 	* include/time.h: Correct typos. Add MSVCRT_VERSION >= 800 guard for

--- a/include/_mingw.h
+++ b/include/_mingw.h
@@ -195,8 +195,22 @@
 # endif
 #endif
 
+/* _CRTALIAS will be used when we have a function whose purpose is to return
+ * the value of a similar function. This alias function will contain one line
+ * of code.
+ */
 #define _CRTALIAS __CRT_INLINE __attribute__ ((__always_inline__))
 
+/* __CRT_MAYBE_INLINE is to be used when we provide functions in the headers
+ * to provide compatibility between differing versions of MSVCRT.DLL for
+ * differing OS versions.  See stat.h for examples.
+ */
+#ifndef __NO_INLINE__
+#define __CRT_MAYBE_INLINE __CRT_INLINE
+#else /* def __NO_INLINE__ */
+#define __CRT_MAYBE_INLINE
+#endif /* ndef __NO_INLINE__ */
+
 #ifdef __cplusplus
 # define   BEGIN_C_DECLS	extern "C" {
 # define __UNUSED_PARAM(x)

--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -193,98 +193,90 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW _fstat32 (int _v1, struct _stat32* _v2) {
 _CRTIMP int __cdecl __MINGW_NOTHROW _fstat64 (int, struct _stat64*);
 int __cdecl __MINGW_NOTHROW _fstat32i64 (int, struct _stat32i64*);
 int __cdecl __MINGW_NOTHROW _fstat64i32 (int, struct _stat64i32*);
-#ifndef __NO_INLINE__
 #include <string.h> /* Need memset declaration */
-  __CRT_INLINE int __cdecl _fstat64i32(int desc, struct _stat64i32 *_stat)
-  {
-    struct _stat64 st;
-    int ret = _fstat64(desc, &st);
-    if (ret == -1) {
-      memset(_stat, 0, sizeof(struct _stat64i32));
-      return -1;
-    }
-    _stat->st_dev = st.st_dev;
-    _stat->st_ino = st.st_ino;
-    _stat->st_mode = st.st_mode;
-    _stat->st_nlink = st.st_nlink;
-    _stat->st_uid = st.st_uid;
-    _stat->st_gid = st.st_gid;
-    _stat->st_rdev = st.st_rdev;
-    _stat->st_size = (_off_t) st.st_size;
-    _stat->st_atime = st.st_atime;
-    _stat->st_mtime = st.st_mtime;
-    _stat->st_ctime = st.st_ctime;
-    return ret;
+__CRT_MAYBE_INLINE int __cdecl _fstat64i32(int desc, struct _stat64i32 *_stat) {
+  struct _stat64 st;
+  int ret = _fstat64(desc, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat64i32));
+    return -1;
   }
-  __CRT_INLINE int __cdecl _fstat32i64(int desc, struct _stat32i64 *_stat)
-  {
-    struct _stat32 st;
-    int ret = _fstat32(desc, &st);
-    if (ret == -1) {
-      memset(_stat, 0, sizeof(struct _stat32i64));
-      return -1;
-    }
-    _stat->st_dev = st.st_dev;
-    _stat->st_ino = st.st_ino;
-    _stat->st_mode = st.st_mode;
-    _stat->st_nlink = st.st_nlink;
-    _stat->st_uid = st.st_uid;
-    _stat->st_gid = st.st_gid;
-    _stat->st_rdev = st.st_rdev;
-    _stat->st_size = (_off_t) st.st_size;
-    _stat->st_atime = st.st_atime;
-    _stat->st_mtime = st.st_mtime;
-    _stat->st_ctime = st.st_ctime;
-    return ret;
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _fstat32i64(int desc, struct _stat32i64 *_stat)
+{
+  struct _stat32 st;
+  int ret = _fstat32(desc, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat32i64));
+    return -1;
   }
-  __CRT_INLINE int __cdecl _stat64i32(const char *fname, struct _stat64i32 *_stat)
-  {
-    struct _stat64 st;
-    int ret = _stat64(fname, &st);
-    if (ret == -1) {
-      memset(_stat, 0, sizeof(struct _stat64i32));
-      return -1;
-    }
-    _stat->st_dev = st.st_dev;
-    _stat->st_ino = st.st_ino;
-    _stat->st_mode = st.st_mode;
-    _stat->st_nlink = st.st_nlink;
-    _stat->st_uid = st.st_uid;
-    _stat->st_gid = st.st_gid;
-    _stat->st_rdev = st.st_rdev;
-    _stat->st_size = (_off_t) st.st_size;
-    _stat->st_atime = st.st_atime;
-    _stat->st_mtime = st.st_mtime;
-    _stat->st_ctime = st.st_ctime;
-    return ret;
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _stat64i32(const char *fname, struct _stat64i32 *_stat)
+{
+  struct _stat64 st;
+  int ret = _stat64(fname, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat64i32));
+    return -1;
   }
-  __CRT_INLINE int __cdecl _stat32i64(const char *fname, struct _stat32i64 *_stat)
-  {
-    struct _stat32 st;
-    int ret = _stat32(fname, &st);
-    if (ret == -1) {
-      memset(_stat, 0, sizeof(struct _stat32i64));
-      return -1;
-    }
-    _stat->st_dev = st.st_dev;
-    _stat->st_ino = st.st_ino;
-    _stat->st_mode = st.st_mode;
-    _stat->st_nlink = st.st_nlink;
-    _stat->st_uid = st.st_uid;
-    _stat->st_gid = st.st_gid;
-    _stat->st_rdev = st.st_rdev;
-    _stat->st_size = (_off_t) st.st_size;
-    _stat->st_atime = st.st_atime;
-    _stat->st_mtime = st.st_mtime;
-    _stat->st_ctime = st.st_ctime;
-    return ret;
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _stat32i64(const char *fname, struct _stat32i64 *_stat)
+{
+  struct _stat32 st;
+  int ret = _stat32(fname, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat32i64));
+    return -1;
   }
-#else
-#define _stat32i64 _stat32
-#define _fstat32i64 _fstat32
-#define _stat64i32 _stat64
-#define _fstat64i32 _fstat64
-#endif
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
 
 #define __stat64 _stat64
 #if defined(_USE_32BIT_TIME_T)
@@ -292,13 +284,16 @@ int __cdecl __MINGW_NOTHROW _fstat64i32 (int, struct _stat64i32*);
 #define _fstati64   _fstat32i64
 #define _stat       _stat32
 #define _stati64    _stat32i64
+
 #else  /* !_USE_32BIT_TIME_T */
 #define _fstat      _fstat64i32
 #define _fstati64   _fstat64
 #define _stat       _stat64i32
 #define _stati64    _stat64
+
 #endif /* _USE_32BIT_TIME_T */
 #define _STAT_DEFINED
+
 #endif /* _STAT_DEFINED */
 
 #if !defined(_NO_OLDNAMES) && !defined(__STRICT_ANSI__)
@@ -316,62 +311,58 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW _wstat32 (const wchar_t* _v1, struct _stat
 _CRTIMP int __cdecl __MINGW_NOTHROW _wstat64 (const wchar_t*, struct _stat64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wstat32i64 (const wchar_t*, struct _stat32i64*);
 int __cdecl __MINGW_NOTHROW _wstat64i32 (const wchar_t*, struct _stat64i32*);
-#ifndef __NO_INLINE__
 #include <string.h> /* Need memset declaration */
-  __CRT_INLINE int __cdecl _wstat64i32(const wchar_t *fname, struct _stat64i32 *_stat)
-  {
-    struct _stat64 st;
-    int ret = _wstat64(fname, &st);
-    if (ret == -1) {
-      memset(_stat, 0, sizeof(struct _stat64i32));
-      return -1;
-    }
-    _stat->st_dev = st.st_dev;
-    _stat->st_ino = st.st_ino;
-    _stat->st_mode = st.st_mode;
-    _stat->st_nlink = st.st_nlink;
-    _stat->st_uid = st.st_uid;
-    _stat->st_gid = st.st_gid;
-    _stat->st_rdev = st.st_rdev;
-    _stat->st_size = (_off_t) st.st_size;
-    _stat->st_atime = st.st_atime;
-    _stat->st_mtime = st.st_mtime;
-    _stat->st_ctime = st.st_ctime;
-    return ret;
+__CRT_MAYBE_INLINE int __cdecl _wstat64i32(const wchar_t *fname, struct _stat64i32 *_stat)
+{
+  struct _stat64 st;
+  int ret = _wstat64(fname, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat64i32));
+    return -1;
   }
-  __CRT_INLINE int __cdecl _wstat32i64(const wchar_t *fname, struct _stat32i64 *_stat)
-  {
-    struct _stat32 st;
-    int ret = _wstat32(fname, &st);
-    if (ret == -1) {
-      memset(_stat, 0, sizeof(struct _stat32i64));
-      return -1;
-    }
-    _stat->st_dev = st.st_dev;
-    _stat->st_ino = st.st_ino;
-    _stat->st_mode = st.st_mode;
-    _stat->st_nlink = st.st_nlink;
-    _stat->st_uid = st.st_uid;
-    _stat->st_gid = st.st_gid;
-    _stat->st_rdev = st.st_rdev;
-    _stat->st_size = (_off_t) st.st_size;
-    _stat->st_atime = st.st_atime;
-    _stat->st_mtime = st.st_mtime;
-    _stat->st_ctime = st.st_ctime;
-    return ret;
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
+__CRT_MAYBE_INLINE int __cdecl _wstat32i64(const wchar_t *fname, struct _stat32i64 *_stat)
+{
+  struct _stat32 st;
+  int ret = _wstat32(fname, &st);
+  if (ret == -1) {
+    memset(_stat, 0, sizeof(struct _stat32i64));
+    return -1;
   }
-#else
-#define _wstat32i64 _wstat32
-#define _wstat64i32 _wstat64
-#endif
+  _stat->st_dev = st.st_dev;
+  _stat->st_ino = st.st_ino;
+  _stat->st_mode = st.st_mode;
+  _stat->st_nlink = st.st_nlink;
+  _stat->st_uid = st.st_uid;
+  _stat->st_gid = st.st_gid;
+  _stat->st_rdev = st.st_rdev;
+  _stat->st_size = (_off_t) st.st_size;
+  _stat->st_atime = st.st_atime;
+  _stat->st_mtime = st.st_mtime;
+  _stat->st_ctime = st.st_ctime;
+  return ret;
+}
 
 #if defined(_USE_32BIT_TIME_T)
 #define _wstat      _wstat32
 #define _wstati64   _wstat32i64
-#else /* !_USE_32BIT_TIME_T */
 
+#else /* !_USE_32BIT_TIME_T */
 #define _wstat      _wstat64i32
 #define _wstati64   _wstat64
+
 #endif /* _USE_32BIT_TIME_T */
 
 #define _WSTAT_DEFINED

--- a/include/sys/utime.h
+++ b/include/sys/utime.h
@@ -8,11 +8,11 @@
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,6 +36,7 @@
 /*
  * Structure used by _utime function.
  */
+#ifndef _UTIMBUF_DEFINED
 struct _utimbuf
 {
 	time_t	actime;		/* Access time */
@@ -46,6 +47,11 @@ struct __utimbuf32
 	__time32_t actime;
 	__time32_t modtime;
 };
+struct __utimbuf64
+{
+	__time64_t actime;
+	__time64_t modtime;
+};
 
 
 #ifndef	_NO_OLDNAMES
@@ -55,54 +61,99 @@ struct utimbuf
 	time_t	actime;
 	time_t	modtime;
 };
+struct utimbuf32
+{
+    __time32_t actime;
+    __time32_t modtime;
+};
 #endif	/* Not _NO_OLDNAMES */
+#define _UTIMBUF_DEFINED
+#endif /* ndef _UTIMBUF_DEFINED */
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-_CRTIMP int __cdecl __MINGW_NOTHROW	_utime (const char*, struct _utimbuf*);
-
 #ifndef	_NO_OLDNAMES
+#ifdef _USE_32BIT_TIME_T
 _CRTIMP int __cdecl __MINGW_NOTHROW	utime (const char*, struct utimbuf*);
+#else
+#define utime _utime
+#endif
 #endif	/* Not _NO_OLDNAMES */
 
-_CRTIMP int __cdecl __MINGW_NOTHROW	_futime (int, struct _utimbuf*);
-
-/* The wide character version, only available for MSVCRT versions of the
- * C runtime library. */
-_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t*, struct _utimbuf*);
-
-/* These require newer versions of msvcrt.dll (6.10 or higher).  */ 
-struct __utimbuf64
-{
-	__time64_t actime;
-	__time64_t modtime;
-};
-
 _CRTIMP int __cdecl __MINGW_NOTHROW	_utime64 (const char*, struct __utimbuf64*);
-_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime64 (const wchar_t*, struct __utimbuf64*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_futime64 (int, struct __utimbuf64*);
 
+#if MSVCRT_VERSION >= 800
 _CRTIMP int __cdecl __MINGW_NOTHROW	_utime32 (const char*, struct __utimbuf32*);
-_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime32 (const wchar_t*, struct __utimbuf32*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_futime32 (int, struct __utimbuf32*);
 
-#ifndef _USE_32BIT_TIME_T
-_CRTALIAS int __cdecl __MINGW_NOTHROW	_utime (const char* _v1, struct _utimbuf* _v2)	   { return(_utime64  (_v1,(struct __utimbuf64*)_v2)); }
-_CRTALIAS int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t* _v1, struct _utimbuf* _v2) { return(_wutime64 (_v1,(struct __utimbuf64*)_v2)); }
-_CRTALIAS int __cdecl __MINGW_NOTHROW	_futime (int _v1, struct _utimbuf* _v2)		   { return(_futime64 (_v1,(struct __utimbuf64*)_v2)); }
 #else
+_CRTIMP int __cdecl __MINGW_NOTHROW	_utime (const char*, struct _utimbuf*);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _utime32 (const char* _v1, struct __utimbuf32* _v2) {
+    return _utime(_v1, _v2);
+}
+
+_CRTIMP int __cdecl __MINGW_NOTHROW	_futime (int, struct _utimbuf*);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _futime32 (int _v1, struct __utimbuf32* _v2) {
+    return _futime(_v1, _v2);
+}
 
-_CRTALIAS int __cdecl __MINGW_NOTHROW	_utime (const char* _v1, struct _utimbuf* _v2)	   { return(_utime32  (_v1,(struct __utimbuf32*)_v2)); }
-_CRTALIAS int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t* _v1, struct _utimbuf* _v2) { return(_wutime32 (_v1,(struct __utimbuf32*)_v2)); }
-_CRTALIAS int __cdecl __MINGW_NOTHROW	_futime (int _v1, struct _utimbuf* _v2)		   { return(_futime32 (_v1,(struct __utimbuf32*)_v2)); }
 #endif
 
+#ifndef _USE_32BIT_TIME_T
+_CRTALIAS int __cdecl __MINGW_NOTHROW	_utime (const char* _v1, struct _utimbuf* _v2) {
+    return(_utime64  (_v1,(struct __utimbuf64*)_v2));
+}
+_CRTALIAS int __cdecl __MINGW_NOTHROW	_futime (int _v1, struct _utimbuf* _v2) {
+    return(_futime64 (_v1,(struct __utimbuf64*)_v2));
+}
+
+#else /* def _USE_32BIT_TIME_T */
+#if MSVCRT_VERSION >= 800
+_CRTALIAS int __cdecl __MINGW_NOTHROW	_utime (const char* _v1, struct _utimbuf* _v2) {
+    return(_utime32  (_v1,(struct __utimbuf32*)_v2));
+}
+_CRTALIAS int __cdecl __MINGW_NOTHROW	_futime (int _v1, struct _utimbuf* _v2)	{
+    return(_futime32 (_v1,(struct __utimbuf32*)_v2));
+}
+#endif /* MSVCRT_VERSION >= 800 */
+
+#endif /* ndef _USE_32BIT_TIME_T */
+
+#ifndef _WUTIME_DEFINED
+_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime64 (const wchar_t*, struct __utimbuf64*);
+#if MSVCRT_VERSION >= 800
+_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime32 (const wchar_t*, struct __utimbuf32*);
+
+#else /* MSVCRT_VERSION < 800 */
+_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t*, struct _utimbuf*);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _wutime32 (const wchar_t* _v1, struct __utimbuf32* _v2) {
+    return _wutime(_v1, _v2);
+}
+
+#endif /* MSVCRT_VERSION >= 800 */
+#ifdef _USE_32BIT_TIME_T
+#if MSVCRT_VERSION >= 800
+_CRTALIAS int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t* _v1, struct _utimbuf* _v2) {
+    return(_wutime32 (_v1,(struct __utimbuf32*)_v2));
+}
+#endif /* MSVCRT_VERSION >= 800 */
+
+#else /* ndef _USE_32BIT_TIME_T */
+_CRTALIAS int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t* _v1, struct _utimbuf* _v2) {
+    return(_wutime64 (_v1,(struct __utimbuf64*)_v2));
+}
+
+#endif /* def _USE_32BIT_TIME_T */
+#define _WUTIME_DEFINED
+#endif /* ndef _WUTIME_DEFINED */
+
 #ifdef	__cplusplus
 }
 #endif
 
 #endif	/* Not RC_INVOKED */
 
-#endif	/* Not _UTIME_H_ */
+#endif	/* Not _UTIME_H_ */
\ No newline at end of file

--- a/include/wchar.h
+++ b/include/wchar.h
@@ -98,6 +98,43 @@ struct tm {
 #define _TM_DEFINED
 #endif
 
+/*
+ * Structure used by _utime function.
+ */
+#ifndef _UTIMBUF_DEFINED
+struct _utimbuf
+{
+	time_t	actime;		/* Access time */
+	time_t	modtime;	/* Modification time */
+};
+struct __utimbuf32
+{
+	__time32_t actime;
+	__time32_t modtime;
+};
+struct __utimbuf64
+{
+	__time64_t actime;
+	__time64_t modtime;
+};
+
+
+#ifndef	_NO_OLDNAMES
+/* NOTE: Must be the same as _utimbuf above. */
+struct utimbuf
+{
+	time_t	actime;
+	time_t	modtime;
+};
+struct utimbuf32
+{
+    __time32_t actime;
+    __time32_t modtime;
+};
+#endif	/* Not _NO_OLDNAMES */
+#define _UTIMBUF_DEFINED
+#endif /* ndef _UTIMBUF_DEFINED */
+
 #ifndef _WSTDIO_DEFINED
 /*  Also in stdio.h - keep in sync */
 _CRTIMP int __cdecl __MINGW_NOTHROW	fwprintf (FILE*, const wchar_t*, ...);
@@ -226,6 +263,35 @@ _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_
 #endif /* __STRICT_ANSI__ */
 
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
+
+#ifndef _WUTIME_DEFINED
+_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime64 (const wchar_t*, struct __utimbuf64*);
+#if MSVCRT_VERSION >= 800
+_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime32 (const wchar_t*, struct __utimbuf32*);
+
+#else /* MSVCRT_VERSION < 800 */
+_CRTIMP int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t*, struct _utimbuf*);
+_CRTALIAS int __cdecl __MINGW_NOTHROW _wutime32 (const wchar_t* _v1, struct __utimbuf32* _v2) {
+    return _wutime(_v1, _v2);
+}
+
+#endif /* MSVCRT_VERSION >= 800 */
+#ifdef _USE_32BIT_TIME_T
+#if MSVCRT_VERSION >= 800
+_CRTALIAS int __cdecl __MINGW_NOTHROW _wutime (const wchar_t* _v1, struct _utimbuf* _v2) {
+    return(_wutime32 (_v1,(struct __utimbuf32*)_v2));
+}
+#endif /* MSVCRT_VERSION >= 800 */
+
+#else /* ndef _USE_32BIT_TIME_T */
+_CRTALIAS int __cdecl __MINGW_NOTHROW _wutime (const wchar_t* _v1, struct _utimbuf* _v2) {
+    return(_wutime64 (_v1,(struct __utimbuf64*)_v2));
+}
+
+#endif /* def _USE_32BIT_TIME_T */
+#define _WUTIME_DEFINED
+#endif /* ndef _WUTIME_DEFINED */
+
 #define _WTIME_DEFINED
 #endif /* _WTIME_DEFINED */