Remove ctime/_ctime32 .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/_ctime32.c | 12 ------------
mingw-w64-crt/misc/ctime.c | 19 -------------------
15 files changed, 21 insertions(+), 45 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_ctime32.c
delete mode 100644 mingw-w64-crt/misc/ctime.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 6de6720..0682d2c 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -175,9 +175,9 @@ 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/_ctime32.c misc/_gmtime32.c misc/_localtime32.c
misc/_mkgmtime.c misc/_mkgmtime32.c \
+ misc/_gmtime32.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/ctime.c
misc/delay-f.c misc/delay-n.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 \
misc/feclearexcept.c misc/fegetenv.c misc/fegetexceptflag.c
misc/fegetround.c misc/feholdexcept.c \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index c12275b..4531a4e 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -786,7 +786,8 @@ _cscanf
_cscanf_l
_cscanf_s
_cscanf_s_l
-_ctime32 DATA
+_ctime32
+ctime == _ctime32
_ctime32_s
_ctime64
_ctime64_s
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index 69b74a0..70e4331 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -911,6 +911,7 @@ _cscanf_l
_cscanf_s
_cscanf_s_l
_ctime32
+ctime == _ctime32
_ctime32_s
_ctime64
_ctime64_s
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index 824b7bc..2280373 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -528,8 +528,8 @@ clearerr
clock
cos
cosh
-ctime DATA
-;_ctime32 = ctime
+_ctime32
+ctime == _ctime32
difftime
div
exit
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index 7403049..2bfbd11 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -411,7 +411,8 @@ _cscanf
_cscanf_l
_cscanf_s
_cscanf_s_l
-_ctime32 DATA
+_ctime32
+ctime == _ctime32
_ctime32_s
_ctime64
_ctime64_s
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index f803b12..d16967a 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -468,6 +468,7 @@ _cscanf_l
_cscanf_s
_cscanf_s_l
_ctime32
+ctime == _ctime32
_ctime32_s
_ctime64
_ctime64_s
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 38f3f73..0a1e4de 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -530,8 +530,8 @@ clearerr
clock
cos
cosh
-ctime DATA
-;_ctime32 = ctime
+ctime
+_ctime32 == ctime
difftime
div
exit
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index 162872f..ec85dc0 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -744,9 +744,10 @@ _cscanf
_cscanf_l
_cscanf_s
_cscanf_s_l
-_ctime32 DATA
+_ctime32
_ctime32_s
_ctime64
+ctime == _ctime64
_ctime64_s
_cwait
_cwprintf
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index f1f2c56..5e40913 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -873,6 +873,7 @@ _cscanf_s_l
_ctime32
_ctime32_s
_ctime64
+ctime == _ctime64
_ctime64_s
_cwait
_cwprintf
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index 922fee7..47aa3f2 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -222,6 +222,7 @@ _cputws
_creat
_cscanf
_ctime64
+ctime == _ctime64
_ctype
_cwait
_cwprintf
@@ -654,8 +655,7 @@ cos
cosf
cosh
coshf
-ctime DATA
-;_ctime32 = ctime
+_ctime32
difftime
div
exit
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index d29e607..93893ea 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -359,9 +359,10 @@ _cscanf
_cscanf_l
_cscanf_s
_cscanf_s_l
-_ctime32 DATA
+_ctime32
_ctime32_s
_ctime64
+ctime == _ctime64
_ctime64_s
_cwait
_cwprintf
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index 6f62124..2751020 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -410,6 +410,7 @@ _cscanf_l
_cscanf_s
_cscanf_s_l
_ctime32
+ctime == _ctime32
_ctime32_s
_ctime64
_ctime64_s
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index 4a91ca8..0026725 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -1038,8 +1038,7 @@ cos
;cosf
cosh
;coshf
-ctime DATA
-;_ctime32 = ctime
+ctime
difftime
div
exit
diff --git a/mingw-w64-crt/misc/_ctime32.c b/mingw-w64-crt/misc/_ctime32.c
deleted file mode 100644
index d3e6b32..0000000
--- a/mingw-w64-crt/misc/_ctime32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern char * (__cdecl * __MINGW_IMP_SYMBOL(ctime))(const __time32_t *);
-
-char *__cdecl _ctime32(const __time32_t *_Time)
-{
- return (*__MINGW_IMP_SYMBOL(ctime))(_Time);
-}
-
diff --git a/mingw-w64-crt/misc/ctime.c b/mingw-w64-crt/misc/ctime.c
deleted file mode 100644
index 7ce4c41..0000000
--- a/mingw-w64-crt/misc/ctime.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
-char *__cdecl ctime(const time_t *_Time)
-{
- return _ctime64(_Time);
-}
-#else
-char *__cdecl ctime(const time_t *_Time)
-{
- return _ctime32(_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
