Remove mktime/_mktime32 .c replacements
---
mingw-w64-crt/Makefile.am | 4 ++--
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 | 4 ++--
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/_mktime32.c | 12 ------------
mingw-w64-crt/misc/mktime.c | 20 --------------------
15 files changed, 21 insertions(+), 46 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_mktime32.c
delete mode 100644 mingw-w64-crt/misc/mktime.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 3892922..7049c86 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -176,7 +176,7 @@ src_libmingwex=\
math/cephes_emath.h math/cephes_mconf.h math/fastmath.h math/fp_consts.h
math/abs64.c \
\
misc/_localtime32.c
misc/_mkgmtime.c misc/_mkgmtime32.c \
- misc/_mktime32.c misc/_wctime.c misc/_wctime32.c
misc/alarm.c \
+ misc/_wctime.c misc/_wctime32.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 \
misc/dirname.c misc/execv.c misc/execve.c
misc/execvp.c misc/execvpe.c \
@@ -187,7 +187,7 @@ src_libmingwex=\
misc/iswblank.c misc/localtime.c misc/mb_wc_common.h
misc/mbrtowc.c misc/mbsinit.c \
misc/mempcpy.c misc/mingw-aligned-malloc.c misc/mingw-fseek.c
misc/mingw_get_codepage.c misc/mingw_getsp.S \
misc/mingw_matherr.c misc/mingw_mbwc_convert.c
misc/mingw_output_format.c misc/mingw_usleep.c misc/mingw_wcstod.c \
- misc/mingw_wcstof.c misc/mingw_wcstold.c misc/mktime.c
misc/seterrno.c misc/sleep.c \
+ misc/mingw_wcstof.c misc/mingw_wcstold.c
misc/seterrno.c misc/sleep.c \
misc/spawnv.c misc/spawnve.c misc/spawnvp.c
misc/spawnvpe.c misc/strnlen.c \
misc/strsafe.c misc/strtoimax.c misc/strtold.c
misc/strtoumax.c misc/tdelete.c \
misc/tfind.c misc/tsearch.c misc/twalk.c
misc/uchar_c16rtomb.c \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index 512aef5..b5f4583 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -1241,7 +1241,8 @@ _mkgmtime32 DATA
_mkgmtime64
_mktemp
_mktemp_s
-_mktime32 DATA
+_mktime32
+mktime == _mktime32
_mktime64
_msize
_nextafter
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index a949eb7..199834b 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -1375,6 +1375,7 @@ _mkgmtime64
_mktemp
_mktemp_s
_mktime32
+mktime == _mktime32
_mktime64
_msize
_nextafter
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index fa62936..c9fb7f1 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -615,8 +615,8 @@ memcmp
memcpy
memmove
memset
-mktime DATA
-;_mktime32 = mktime
+mktime == _mktime32
+_mktime32
modf
perror
;pow
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index f9090b6..c2f93f9 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -869,7 +869,8 @@ _mkgmtime32 DATA
_mkgmtime64
_mktemp
_mktemp_s
-_mktime32 DATA
+_mktime32
+mktime == _mktime32
_mktime64
_msize
_nextafter
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index d7194ac..dbf2d8b 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -933,6 +933,7 @@ _mkgmtime64
_mktemp
_mktemp_s
_mktime32
+mktime == _mktime32
_mktime64
_msize
_msize_dbg
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 8931f6b..2ad325b 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -617,8 +617,8 @@ memcmp
memcpy
memmove
memset
-mktime DATA
-;_mktime32 = mktime
+mktime
+_mktime32 == mktime
modf
perror
;pow
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index b690574..a7f9a64 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -1193,8 +1193,9 @@ _mkgmtime32 DATA
_mkgmtime64
_mktemp
_mktemp_s
-_mktime32 DATA
+_mktime32
_mktime64
+mktime == _mktime64
_msize
_nextafter
_nextafterf
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index 0ec9a69..557be22 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -1319,6 +1319,7 @@ _mktemp
_mktemp_s
_mktime32
_mktime64
+mktime == _mktime64
_msize
_nextafter
_nextafterf
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index 298debe..1267595 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -433,6 +433,7 @@ _mkgmtime DATA
_mkgmtime64
_mktemp
_mktime64
+mktime == _mktime64
_msize
_nextafter
_nextafterf
@@ -746,8 +747,7 @@ memcmp
memcpy
memmove
memset
-mktime DATA
-;_mktime32 = mktime
+_mktime32
modf
modff
perror
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index 0b4251c..8545738 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -811,8 +811,9 @@ _mkgmtime32 DATA
_mkgmtime64
_mktemp
_mktemp_s
-_mktime32 DATA
+_mktime32
_mktime64
+mktime = _mktime64
_msize
_nextafter
_nextafterf
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index 9ff315e..0925420 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -870,6 +870,7 @@ _mktemp
_mktemp_s
_mktime32
_mktime64
+mktime == _mktime64
_msize
_msize_dbg
_nextafter
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index 9f11425..aa8b6e0 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -1139,8 +1139,7 @@ memcpy
memmove
memmove_s
memset
-mktime DATA
-;_mktime32 = mktime
+mktime
modf
;modff
perror
diff --git a/mingw-w64-crt/misc/_mktime32.c b/mingw-w64-crt/misc/_mktime32.c
deleted file mode 100644
index de483c7..0000000
--- a/mingw-w64-crt/misc/_mktime32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern __time32_t (__cdecl *__MINGW_IMP_SYMBOL(mktime))(struct tm *);
-
-__time32_t __cdecl _mktime32(struct tm *_Tm)
-{
- return (*__MINGW_IMP_SYMBOL(mktime))(_Tm);
-}
-
diff --git a/mingw-w64-crt/misc/mktime.c b/mingw-w64-crt/misc/mktime.c
deleted file mode 100644
index 6762c45..0000000
--- a/mingw-w64-crt/misc/mktime.c
+++ /dev/null
@@ -1,20 +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 mktime(struct tm *_Tm)
-{
- return _mktime64(_Tm);
-}
-#else
-time_t __cdecl mktime(struct tm *_Tm)
-{
- return _mktime32(_Tm);
-}
-#endif
-
--
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
