Remove time/_time32 .c replacements
---
mingw-w64-crt/ChangeLog | 7 +
mingw-w64-crt/Makefile.am | 4 +-
mingw-w64-crt/Makefile.in | 1923 +++++++++++++++++++++++++++++++++-----
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 | 4 +-
mingw-w64-crt/misc/_time32.c | 12 -
mingw-w64-crt/misc/time.c | 19 -
17 files changed, 1724 insertions(+), 273 deletions(-)
delete mode 100644 mingw-w64-crt/misc/_time32.c
delete mode 100644 mingw-w64-crt/misc/time.c
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 17cd757..e4f80f5 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-28 Rafaël Carré <fun...@videolan.org>
+
+ * misc/time.c: Remove
+ * misc/_time32.c: Likewise.
+ * lib32/msvcr*.def: Alias time to _time32 when missing
+ * lib64/msvcr*.def: Alias time to _time64 when missing
+
2013-03-14 Kai Tietz <kti...@redhat.com>
* Makefile.am: Add new files to build of libmingwex.a library.
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 6baff41..344cad3 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/_ctime32.c misc/_gmtime32.c misc/_localtime32.c
misc/_mkgmtime.c misc/_mkgmtime32.c \
- misc/_mktime32.c misc/_time32.c misc/_wctime.c
misc/_wctime32.c misc/alarm.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/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 \
@@ -190,7 +190,7 @@ src_libmingwex=\
misc/mingw_wcstof.c misc/mingw_wcstold.c misc/mktime.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/time.c misc/tsearch.c
misc/twalk.c misc/uchar_c16rtomb.c \
+ misc/tfind.c misc/tsearch.c misc/twalk.c
misc/uchar_c16rtomb.c \
misc/uchar_c32rtomb.c misc/uchar_mbrtoc16.c misc/uchar_mbrtoc32.c
misc/wassert.c misc/wcrtomb.c \
misc/wcsnlen.c misc/wcstof.c misc/wcstoimax.c
misc/wcstold.c misc/wcstoumax.c \
misc/wctob.c misc/wctrans.c misc/wctype.c
misc/wdirent.c misc/winbs_uint64.c \
diff --git a/mingw-w64-crt/lib32/msvcr100.def b/mingw-w64-crt/lib32/msvcr100.def
index 57e297a..c12275b 100644
--- a/mingw-w64-crt/lib32/msvcr100.def
+++ b/mingw-w64-crt/lib32/msvcr100.def
@@ -1410,8 +1410,9 @@ _sys_nerr DATA
_tell
_telli64
_tempnam
-_time32 DATA
+_time32
_time64
+time == _time32
_timezone DATA
_tolower
_tolower_l
diff --git a/mingw-w64-crt/lib32/msvcr110.def b/mingw-w64-crt/lib32/msvcr110.def
index 2e7602e..69b74a0 100644
--- a/mingw-w64-crt/lib32/msvcr110.def
+++ b/mingw-w64-crt/lib32/msvcr110.def
@@ -1545,6 +1545,7 @@ _telli64
_tempnam
_time32
_time64
+time == _time32
_timezone DATA
_tolower
_tolower_l
diff --git a/mingw-w64-crt/lib32/msvcr80.def b/mingw-w64-crt/lib32/msvcr80.def
index 74ca3ac..824b7bc 100644
--- a/mingw-w64-crt/lib32/msvcr80.def
+++ b/mingw-w64-crt/lib32/msvcr80.def
@@ -671,8 +671,8 @@ swscanf
system
tan
tanh
-time DATA
-;_time32 = time
+_time32
+time == _time32
tmpfile
tmpnam
tolower
diff --git a/mingw-w64-crt/lib32/msvcr90.def b/mingw-w64-crt/lib32/msvcr90.def
index 29c94ac..7403049 100644
--- a/mingw-w64-crt/lib32/msvcr90.def
+++ b/mingw-w64-crt/lib32/msvcr90.def
@@ -1044,7 +1044,8 @@ _sys_nerr DATA
_tell
_telli64
_tempnam
-_time32 DATA
+_time32
+time == _time32
_time64
_timezone DATA
_tolower
diff --git a/mingw-w64-crt/lib32/msvcr90d.def b/mingw-w64-crt/lib32/msvcr90d.def
index 39d1815..f803b12 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def
+++ b/mingw-w64-crt/lib32/msvcr90d.def
@@ -1111,6 +1111,7 @@ _telli64
_tempnam
_tempnam_dbg
_time32
+time == _time32
_time64
_timezone DATA
_tolower
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 1694c52..38f3f73 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -673,8 +673,7 @@ swscanf
system
tan
tanh
-time DATA
-;_time32 = time
+time
tmpfile
tmpnam
tolower
@@ -735,6 +734,7 @@ _mbcasemap
_mktime64
_osplatform DATA
_stat64
+_time32 == time
_time64
_utime64
_wctime64
diff --git a/mingw-w64-crt/lib64/msvcr100.def b/mingw-w64-crt/lib64/msvcr100.def
index 8e67639..162872f 100644
--- a/mingw-w64-crt/lib64/msvcr100.def
+++ b/mingw-w64-crt/lib64/msvcr100.def
@@ -1357,8 +1357,9 @@ _sys_nerr DATA
_tell
_telli64
_tempnam
-_time32 DATA
+_time32
_time64
+time == _time64
_timezone DATA
_tolower
_tolower_l
diff --git a/mingw-w64-crt/lib64/msvcr110.def b/mingw-w64-crt/lib64/msvcr110.def
index cd79cdd..f1f2c56 100644
--- a/mingw-w64-crt/lib64/msvcr110.def
+++ b/mingw-w64-crt/lib64/msvcr110.def
@@ -1483,6 +1483,7 @@ _telli64
_tempnam
_time32
_time64
+time == _time64
_timezone DATA
_tolower
_tolower_l
diff --git a/mingw-w64-crt/lib64/msvcr80.def b/mingw-w64-crt/lib64/msvcr80.def
index 9902c80..922fee7 100644
--- a/mingw-w64-crt/lib64/msvcr80.def
+++ b/mingw-w64-crt/lib64/msvcr80.def
@@ -516,6 +516,7 @@ _tell
_telli64
_tempnam
_time64
+time == _time64
_timezone DATA
_tolower
_toupper
@@ -808,8 +809,7 @@ system
tan
tanf
tanh
-time DATA
-;_time32 = time
+_time32
tmpfile
tmpnam
tolower
diff --git a/mingw-w64-crt/lib64/msvcr90.def b/mingw-w64-crt/lib64/msvcr90.def
index 9d3aebf..d29e607 100644
--- a/mingw-w64-crt/lib64/msvcr90.def
+++ b/mingw-w64-crt/lib64/msvcr90.def
@@ -977,8 +977,9 @@ _sys_nerr DATA
_tell
_telli64
_tempnam
-_time32 DATA
+_time32
_time64
+time == _time64
_timezone DATA
_tolower
_tolower_l
diff --git a/mingw-w64-crt/lib64/msvcr90d.def b/mingw-w64-crt/lib64/msvcr90d.def
index cd1df47..6f62124 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def
+++ b/mingw-w64-crt/lib64/msvcr90d.def
@@ -1039,6 +1039,7 @@ _tempnam
_tempnam_dbg
_time32
_time64
+time == _time64
_timezone DATA
_tolower
_tolower_l
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index fbcf80d..4a91ca8 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -782,6 +782,7 @@ _sys_nerr DATA
_tell
_telli64
_tempnam
+_time32
_time64
_timezone DATA
_tolower
@@ -1217,8 +1218,7 @@ system
tan
;tanf
tanh
-time DATA
-;_time32 = time
+time == _time64
tmpfile
tmpfile_s
tmpnam
diff --git a/mingw-w64-crt/misc/_time32.c b/mingw-w64-crt/misc/_time32.c
deleted file mode 100644
index a3cfb8f..0000000
--- a/mingw-w64-crt/misc/_time32.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __NO_INLINE__
-#define __NO_INLINE__
-#endif
-#include <time.h>
-
-extern __time32_t (__cdecl *__MINGW_IMP_SYMBOL(time))(__time32_t *);
-
-__time32_t __cdecl _time32(__time32_t *_Time)
-{
- return (*__MINGW_IMP_SYMBOL(time))(_Time);
-}
-
diff --git a/mingw-w64-crt/misc/time.c b/mingw-w64-crt/misc/time.c
deleted file mode 100644
index 6121b51..0000000
--- a/mingw-w64-crt/misc/time.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
-time_t __cdecl time(time_t *_Time)
-{
- return _time64(_Time);
-}
-#else
-time_t __cdecl time(time_t *_Time)
-{
- return _time32(_Time);
-}
-#endif
--
1.7.10.4
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
