Remove gmtime/_gmtime32 .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/_gmtime32.c | 11 -----------
mingw-w64-crt/misc/gmtime.c | 20 --------------------
15 files changed, 21 insertions(+), 45 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_gmtime32.c
delete mode 100644 mingw-w64-crt/misc/gmtime.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 0682d2c..3892922 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -175,7 +175,7 @@ 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/_gmtime32.c misc/_localtime32.c
misc/_mkgmtime.c misc/_mkgmtime32.c \
+ misc/_localtime32.c
misc/_mkgmtime.c misc/_mkgmtime32.c \
misc/_mktime32.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 \
@@ -183,7 +183,7 @@ src_libmingwex=\
misc/feclearexcept.c misc/fegetenv.c misc/fegetexceptflag.c
misc/fegetround.c misc/feholdexcept.c \
misc/feraiseexcept.c misc/fesetenv.c misc/fesetexceptflag.c
misc/fesetround.c misc/fetestexcept.c \
misc/feupdateenv.c misc/ftruncate.c misc/fwide.c
misc/getlogin.c misc/getopt.c \
- misc/gettimeofday.c misc/gmtime.c misc/imaxabs.c
misc/imaxdiv.c misc/isblank.c \
+ misc/gettimeofday.c misc/imaxabs.c
misc/imaxdiv.c misc/isblank.c \
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 \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index 4531a4e..512aef5 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -946,7 +946,8 @@ _getwche_nolock
_getws
_getws_s
_global_unwind2
-_gmtime32 DATA
+_gmtime32
+gmtime == _gmtime32
_gmtime32_s
_gmtime64
_gmtime64_s
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index 70e4331..a949eb7 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -1069,6 +1069,7 @@ _getws
_getws_s
_global_unwind2
_gmtime32
+gmtime == _gmtime32
_gmtime32_s
_gmtime64
_gmtime64_s
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index 2280373..fa62936 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -569,8 +569,8 @@ getenv
gets
getwc
getwchar
-gmtime DATA
-;_gmtime32 = gmtime
+_gmtime32
+gmtime == _gmtime32
is_wctype
isalnum
isalpha
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index 2bfbd11..f9090b6 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -575,7 +575,8 @@ _getwche_nolock
_getws
_getws_s
_global_unwind2
-_gmtime32 DATA
+_gmtime32
+gmtime == _gmtime32
_gmtime32_s
_gmtime64
_gmtime64_s
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index d16967a..d7194ac 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -639,6 +639,7 @@ _getws
_getws_s
_global_unwind2
_gmtime32
+gmtime == _gmtime32
_gmtime32_s
_gmtime64
_gmtime64_s
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 0a1e4de..8931f6b 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -571,8 +571,8 @@ getenv
gets
getwc
getwchar
-gmtime DATA
-;_gmtime32 = gmtime
+gmtime
+_gmtime32 == gmtime
is_wctype
isalnum
isalpha
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index ec85dc0..b690574 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -901,9 +901,10 @@ _getwche
_getwche_nolock
_getws
_getws_s
-_gmtime32 DATA
+_gmtime32
_gmtime32_s
_gmtime64
+gmtime == _gmtime64
_gmtime64_s
_heapadd
_heapchk
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index 5e40913..0ec9a69 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -1028,6 +1028,7 @@ _getws_s
_gmtime32
_gmtime32_s
_gmtime64
+gmtime == _gmtime64
_gmtime64_s
_heapadd
_heapchk
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index 47aa3f2..298debe 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -698,8 +698,8 @@ getenv
gets
getwc
getwchar
-gmtime DATA
-;_gmtime32 = gmtime
+gmtime == _gmtime64
+_gmtime32
is_wctype
isalnum
isalpha
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index 93893ea..0b4251c 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -520,7 +520,8 @@ _getwche
_getwche_nolock
_getws
_getws_s
-_gmtime32 DATA
+_gmtime32
+gmtime == _gmtime64
_gmtime32_s
_gmtime64
_gmtime64_s
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index 2751020..9ff315e 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -578,6 +578,7 @@ _getwche_nolock
_getws
_getws_s
_gmtime32
+gmtime == _gmtime64
_gmtime32_s
_gmtime64
_gmtime64_s
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index 0026725..9f11425 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -1088,8 +1088,7 @@ getenv_s
gets
getwc
getwchar
-gmtime DATA
-;_gmtime32 = gmtime
+gmtime
is_wctype
isalnum
isalpha
diff --git a/mingw-w64-crt/misc/_gmtime32.c b/mingw-w64-crt/misc/_gmtime32.c
deleted file mode 100644
index 671b198..0000000
--- a/mingw-w64-crt/misc/_gmtime32.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern struct tm * (__cdecl *__MINGW_IMP_SYMBOL(gmtime))(const __time32_t *);
-
-struct tm *__cdecl _gmtime32(const __time32_t *_Time)
-{
- return (*__MINGW_IMP_SYMBOL(gmtime))(_Time);
-}
diff --git a/mingw-w64-crt/misc/gmtime.c b/mingw-w64-crt/misc/gmtime.c
deleted file mode 100644
index 1bd1036..0000000
--- a/mingw-w64-crt/misc/gmtime.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
-struct tm *__cdecl gmtime(const time_t *_Time)
-{
- return _gmtime64(_Time);
-}
-#else
-struct tm *__cdecl gmtime(const time_t *_Time)
-{
- return _gmtime32(_Time);
-}
-#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
