Remove localtime/_localtime32 .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/_localtime32.c | 12 ------------
mingw-w64-crt/misc/localtime.c | 20 --------------------
15 files changed, 21 insertions(+), 46 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_localtime32.c
delete mode 100644 mingw-w64-crt/misc/localtime.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 5d3ac16..1050a32 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/_localtime32.c
misc/_mkgmtime.c misc/_mkgmtime32.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 \
@@ -184,7 +184,7 @@ src_libmingwex=\
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/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/iswblank.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/seterrno.c misc/sleep.c \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index 6bf7650..a3910dd 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -1075,7 +1075,8 @@ _lfind_s
_loaddll
_local_unwind2
_local_unwind4
-_localtime32 DATA
+_localtime32
+localtime == _localtime32
_localtime32_s
_localtime64
_localtime64_s
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index 959b99c..893b84f 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -1209,6 +1209,7 @@ _loaddll
_local_unwind2
_local_unwind4
_localtime32
+localtime == _localtime32
_localtime32_s
_localtime64
_localtime64_s
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index 2a1db1f..c5e51df 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -601,8 +601,8 @@ labs
ldexp DATA
ldiv
localeconv
-localtime DATA
-;_localtime32 = localtime
+localtime == _localtime32
+_localtime32
log DATA
log10
longjmp DATA
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index b3111df..2c479c2 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -703,7 +703,8 @@ _lfind_s
_loaddll
_local_unwind2
_local_unwind4
-_localtime32 DATA
+_localtime32
+localtime == _localtime32
_localtime32_s
_localtime64
_localtime64_s
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index c0951fc..b90a268 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -766,6 +766,7 @@ _loaddll
_local_unwind2
_local_unwind4
_localtime32
+localtime == _localtime32
_localtime32_s
_localtime64
_localtime64_s
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 39c41f8..f83bc14 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -603,8 +603,8 @@ labs
ldexp DATA
ldiv
localeconv
-localtime DATA
-;_localtime32 = localtime
+localtime
+_localtime32 == localtime
log DATA
log10
longjmp DATA
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index 7bca3fe..a439782 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -1027,9 +1027,10 @@ _lfind
_lfind_s
_loaddll
_local_unwind
-_localtime32 DATA
+_localtime32
_localtime32_s
_localtime64
+localtime == _localtime64
_localtime64_s
_lock
_lock_file
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index 8e856a7..e3beeec 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -1154,6 +1154,7 @@ _local_unwind
_localtime32
_localtime32_s
_localtime64
+localtime == _localtime64
_localtime64_s
_lock
_lock_file
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index e21d10f..8a6b2c3 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -358,6 +358,7 @@ _lfind
_loaddll
_local_unwind
_localtime64
+localtime == _localtime64
_lock
_locking
_logb
@@ -731,8 +732,7 @@ labs
ldexp DATA
ldiv
localeconv
-localtime DATA
-;_localtime32 = localtime
+_localtime32
log DATA
log10
log10f
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index 1fbc3d7..1c1c4c2 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -645,9 +645,10 @@ _lfind
_lfind_s
_loaddll
_local_unwind
-_localtime32 DATA
+_localtime32
_localtime32_s
_localtime64
+localtime == _localtime64
_localtime64_s
_lock
_lock_file
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index 4901aa3..90e6d1c 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -704,6 +704,7 @@ _local_unwind
_localtime32
_localtime32_s
_localtime64
+localtime == _localtime64
_localtime64_s
_lock
_lock_file
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index 945d4be..c02ceb5 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -1118,8 +1118,7 @@ labs
ldexp DATA
ldiv
localeconv
-localtime DATA
-;_localtime32 = localtime
+localtime
log DATA
log10
log10f DATA
diff --git a/mingw-w64-crt/misc/_localtime32.c
b/mingw-w64-crt/misc/_localtime32.c
deleted file mode 100644
index e0e476f..0000000
--- a/mingw-w64-crt/misc/_localtime32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern struct tm * (__cdecl *__MINGW_IMP_SYMBOL(localtime))(const __time32_t
*);
-
-struct tm *__cdecl _localtime32(const __time32_t *_Time)
-{
- return (*__MINGW_IMP_SYMBOL(localtime))(_Time);
-}
-
diff --git a/mingw-w64-crt/misc/localtime.c b/mingw-w64-crt/misc/localtime.c
deleted file mode 100644
index 2a2da2d..0000000
--- a/mingw-w64-crt/misc/localtime.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 localtime(const time_t *_Time)
-{
- return _localtime64(_Time);
-}
-#else
-struct tm *__cdecl localtime(const time_t *_Time)
-{
- return _localtime32(_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
