Remove _wctime/_wctime32 .c replacements
---
mingw-w64-crt/Makefile.am | 2 +-
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/_wctime.c | 22 ----------------------
mingw-w64-crt/misc/_wctime32.c | 17 -----------------
15 files changed, 20 insertions(+), 52 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_wctime.c
delete mode 100644 mingw-w64-crt/misc/_wctime32.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 7049c86..5d3ac16 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/_wctime.c misc/_wctime32.c
misc/alarm.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 \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index b5f4583..6bf7650 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -1551,7 +1551,8 @@ _wcsupr_l
_wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
-_wctime32 DATA
+_wctime32
+_wctime == _wctime32
_wctime32_s
_wctime64
_wctime64_s
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index 199834b..959b99c 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -1686,6 +1686,7 @@ _wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
_wctime32
+_wctime == _wctime32
_wctime32_s
_wctime64
_wctime64_s
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index c9fb7f1..2a1db1f 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -446,8 +446,8 @@ _wcsnset
_wcsrev
_wcsset
_wcsupr
-_wctime DATA
-;_wctime32 = _wctime
+_wctime32
+_wctime == _wctime32
_wenviron DATA
_wexecl
_wexecle
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index c2f93f9..b3111df 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -1185,7 +1185,8 @@ _wcsupr_l
_wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
-_wctime32 DATA
+_wctime32
+_wctime == _wctime32
_wctime32_s
_wctime64
_wctime64_s
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index dbf2d8b..c0951fc 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -1253,6 +1253,7 @@ _wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
_wctime32
+_wctime == _wctime32
_wctime32_s
_wctime64
_wctime64_s
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 2ad325b..39c41f8 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -447,8 +447,8 @@ _wcsnset
_wcsrev
_wcsset
_wcsupr
-_wctime DATA
-;_wctime32 = _wctime
+_wctime
+_wctime32 == _wctime
_wenviron DATA
_wexecl
_wexecle
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index a7f9a64..7bca3fe 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -1498,9 +1498,10 @@ _wcsupr_l
_wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
-_wctime32 DATA
+_wctime32
_wctime32_s
_wctime64
+_wctime == _wctime64
_wctime64_s
_wctomb_l
_wctomb_s_l
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index 557be22..8e856a7 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -1626,6 +1626,7 @@ _wcsxfrm_l
_wctime32
_wctime32_s
_wctime64
+_wctime == _wctime64
_wctime64_s
_wctomb_l
_wctomb_s_l
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index 1267595..e21d10f 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -560,9 +560,9 @@ _wcsset
_wcstoi64
_wcstoui64
_wcsupr
-_wctime DATA
-;_wctime32 = _wctime
+_wctime32
_wctime64
+_wctime == _wctime64
_wctype
_wenviron DATA
_wexecl
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index 8545738..1fbc3d7 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -1118,9 +1118,10 @@ _wcsupr_l
_wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
-_wctime32 DATA
+_wctime32
_wctime32_s
_wctime64
+_wctime == _wctime64
_wctime64_s
_wctomb_l
_wctomb_s_l
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index 0925420..4901aa3 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -1182,6 +1182,7 @@ _wcsxfrm_l
_wctime32
_wctime32_s
_wctime64
+_wctime == _wctime64
_wctime64_s
_wctomb_l
_wctomb_s_l
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index aa8b6e0..945d4be 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -910,8 +910,7 @@ _wcsupr_l
_wcsupr_s
_wcsupr_s_l
_wcsxfrm_l
-_wctime DATA
-;_wctime32 = _wctime
+_wctime
; _wctime32_s replaced by emu
_wctime64
; _wctime64_s replaced by emu
diff --git a/mingw-w64-crt/misc/_wctime.c b/mingw-w64-crt/misc/_wctime.c
deleted file mode 100644
index 3379484..0000000
--- a/mingw-w64-crt/misc/_wctime.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-#ifndef _USE_32BIT_TIME_T
-wchar_t *__cdecl _wctime(const time_t *_Time)
-{
- return _wctime64 (_Time);
-}
-#else
-wchar_t *__cdecl _wctime(const time_t *_Time)
-{
- return _wctime32 (_Time);
-}
-#endif /* _USE_32BIT_TIME_T */
-
diff --git a/mingw-w64-crt/misc/_wctime32.c b/mingw-w64-crt/misc/_wctime32.c
deleted file mode 100644
index d8a0efb..0000000
--- a/mingw-w64-crt/misc/_wctime32.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern wchar_t * (__cdecl *__MINGW_IMP_SYMBOL(_wctime))(const __time32_t *);
-
-wchar_t *__cdecl _wctime32(const __time32_t *_Time)
-{
- return (*__MINGW_IMP_SYMBOL(_wctime))(_Time);
-}
-
--
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
