Remove _mkgmtime/_mkgmtime32 .c replacements
msvcrt.dll does not provide these symbols in 32bits
---
mingw-w64-crt/Makefile.am | 1 -
mingw-w64-crt/lib32/msvcr100.def | 3 ++-
mingw-w64-crt/lib32/msvcr110.def | 1 +
mingw-w64-crt/lib32/msvcr80.def | 4 ++--
mingw-w64-crt/lib32/msvcr90.def | 3 ++-
mingw-w64-crt/lib32/msvcr90d.def | 1 +
mingw-w64-crt/lib32/msvcrt.def | 3 ---
mingw-w64-crt/lib64/msvcr100.def | 3 ++-
mingw-w64-crt/lib64/msvcr110.def | 1 +
mingw-w64-crt/lib64/msvcr80.def | 4 ++--
mingw-w64-crt/lib64/msvcr90.def | 3 ++-
mingw-w64-crt/lib64/msvcr90d.def | 1 +
mingw-w64-crt/lib64/msvcrt.def | 3 +--
mingw-w64-crt/misc/_mkgmtime.c | 19 -------------------
mingw-w64-crt/misc/_mkgmtime32.c | 11 -----------
15 files changed, 17 insertions(+), 44 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_mkgmtime.c
delete mode 100644 mingw-w64-crt/misc/_mkgmtime32.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 1050a32..a356c8d 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -175,7 +175,6 @@ src_libmingwex=\
math/powi.def.h math/sin.def.h math/sqrt.def.h \
math/cephes_emath.h math/cephes_mconf.h math/fastmath.h math/fp_consts.h
math/abs64.c \
\
-
misc/_mkgmtime.c misc/_mkgmtime32.c \
misc/alarm.c \
misc/basename.c misc/btowc.c
misc/delay-f.c misc/delay-n.c \
misc/delayimp.c misc/difftime.c misc/difftime32.c
misc/difftime64.c misc/dirent.c \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index a3910dd..1f72ace 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -1238,7 +1238,8 @@ _memccpy
_memicmp
_memicmp_l
_mkdir
-_mkgmtime32 DATA
+_mkgmtime32
+_mkgmtime == _mkgmtime32
_mkgmtime64
_mktemp
_mktemp_s
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index 893b84f..66246d2 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -1372,6 +1372,7 @@ _memicmp
_memicmp_l
_mkdir
_mkgmtime32
+_mkgmtime == _mkgmtime32
_mkgmtime64
_mktemp
_mktemp_s
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index c5e51df..d65cab9 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -328,8 +328,8 @@ _mbsstr
_mbstok
_mbstrlen
_mbsupr
-_mkgmtime DATA
-;_mkgmtime32 = _mkgmtime
+_mkgmtime32
+_mkgmtime == _mkgmtime32
_mkgmtime64
_memccpy
_memicmp
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index 2c479c2..7f86c5e 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -866,7 +866,8 @@ _memccpy
_memicmp
_memicmp_l
_mkdir
-_mkgmtime32 DATA
+_mkgmtime32
+_mkgmtime == _mkgmtime32
_mkgmtime64
_mktemp
_mktemp_s
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index b90a268..dcf47c5 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -930,6 +930,7 @@ _memicmp
_memicmp_l
_mkdir
_mkgmtime32
+_mkgmtime == _mkgmtime32
_mkgmtime64
_mktemp
_mktemp_s
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index f83bc14..cc07444 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -727,9 +727,6 @@ _gmtime64
; _localtime32_s replaced by emu
_localtime64
; _localtime64_s replaced by emu
-_mkgmtime DATA
-;_mkgmtime32 = _mkgmtime
-_mkgmtime64
_mbcasemap
_mktime64
_osplatform DATA
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index a439782..23e9ff3 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -1190,8 +1190,9 @@ _memccpy
_memicmp
_memicmp_l
_mkdir
-_mkgmtime32 DATA
+_mkgmtime32
_mkgmtime64
+_mkgmtime == _mkgmtime64
_mktemp
_mktemp_s
_mktime32
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index e3beeec..6eb90c2 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -1316,6 +1316,7 @@ _memicmp_l
_mkdir
_mkgmtime32
_mkgmtime64
+_mkgmtime == _mkgmtime64
_mktemp
_mktemp_s
_mktime32
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index 8a6b2c3..6d97174 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -429,9 +429,9 @@ _mbsupr
_memccpy
_memicmp
_mkdir
-_mkgmtime DATA
-;_mkgmtime32 = _mkgmtime
+_mkgmtime32
_mkgmtime64
+_mkgmtime == _mkgmtime64
_mktemp
_mktime64
mktime == _mktime64
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index 1c1c4c2..f377841 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -808,8 +808,9 @@ _memccpy
_memicmp
_memicmp_l
_mkdir
-_mkgmtime32 DATA
+_mkgmtime32
_mkgmtime64
+_mkgmtime == _mkgmtime64
_mktemp
_mktemp_s
_mktime32
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index 90e6d1c..298169c 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -867,6 +867,7 @@ _memicmp_l
_mkdir
_mkgmtime32
_mkgmtime64
+_mkgmtime == _mkgmtime64
_mktemp
_mktemp_s
_mktime32
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index c02ceb5..c8d6181 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -627,8 +627,7 @@ _memccpy
_memicmp
_memicmp_l
_mkdir
-_mkgmtime DATA
-;_mkgmtime32 = _mkgmtime
+_mkgmtime
_mkgmtime64
_mktemp
; _mktemp_s replaced by emu
diff --git a/mingw-w64-crt/misc/_mkgmtime.c b/mingw-w64-crt/misc/_mkgmtime.c
deleted file mode 100644
index 1db0013..0000000
--- a/mingw-w64-crt/misc/_mkgmtime.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#define __CRT__NO_INLINE
-#include <time.h>
-
-/* FIXME: Relying on _USE_32BIT_TIME_T, which is a user-macro,
-during CRT compilation is plainly broken. Need an appropriate
-implementation to provide users the ability of compiling the
-CRT only with 32-bit time_t behavior. */
-
-#ifndef _USE_32BIT_TIME_T
-time_t __cdecl _mkgmtime(struct tm *_Tm)
-{
- return _mkgmtime64(_Tm);
-}
-#else
-time_t __cdecl _mkgmtime(struct tm *_Tm)
-{
- return _mkgmtime32(_Tm);
-}
-#endif
diff --git a/mingw-w64-crt/misc/_mkgmtime32.c b/mingw-w64-crt/misc/_mkgmtime32.c
deleted file mode 100644
index 2cde6a1..0000000
--- a/mingw-w64-crt/misc/_mkgmtime32.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern __time32_t (__cdecl *__MINGW_IMP_SYMBOL(_mkgmtime))(struct tm *);
-
-__time32_t __cdecl _mkgmtime32(struct tm *_Tm)
-{
- return (*__MINGW_IMP_SYMBOL(_mkgmtime))(_Tm);
-}
--
1.7.10.4
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
