diff options
author | Rosen Penev <rosenp@gmail.com> | 2023-01-09 06:15:55 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-09 15:15:55 +0100 |
commit | 0348e24bab24cc46642d29e3ceab64df22553298 (patch) | |
tree | e9d44e90d33989a413c9b726aa3b9d302949d142 /cpio | |
parent | 2e9bcba70685383426ad42c8856c50ce3214ae24 (diff) | |
download | libarchive-0348e24bab24cc46642d29e3ceab64df22553298.tar.gz |
replace time64 functions with normal ones (#1830)
Otherwise there are 32/64-bit pointer conversions going on. In Windows
since MSVC2005, time_t has been 64-bit. MinGW needs a hack to get 64-bit
time_t.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'cpio')
-rw-r--r-- | cpio/cpio.c | 6 | ||||
-rw-r--r-- | cpio/test/test_option_t.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpio/cpio.c b/cpio/cpio.c index de0144fa..f2d83d94 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -1153,7 +1153,7 @@ list_item_verbose(struct cpio *cpio, struct archive_entry *entry) time_t mtime; static time_t now; struct tm *ltime; -#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S) +#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S) struct tm tmbuf; #endif @@ -1203,8 +1203,8 @@ list_item_verbose(struct cpio *cpio, struct archive_entry *entry) else fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M"; #endif -#if defined(HAVE__LOCALTIME64_S) - ltime = _localtime64_s(&tmbuf, &mtime) ? NULL : &tmbuf; +#if defined(HAVE_LOCALTIME_S) + ltime = localtime_s(&tmbuf, &mtime) ? NULL : &tmbuf; #elif defined(HAVE_LOCALTIME_R) ltime = localtime_r(&mtime, &tmbuf); #else diff --git a/cpio/test/test_option_t.c b/cpio/test/test_option_t.c index 52bcff52..9eef0da5 100644 --- a/cpio/test/test_option_t.c +++ b/cpio/test/test_option_t.c @@ -37,7 +37,7 @@ DEFINE_TEST(test_option_t) char date[32]; char date2[32]; struct tm *tmptr; -#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S) +#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S) struct tm tmbuf; #endif @@ -91,8 +91,8 @@ DEFINE_TEST(test_option_t) #ifdef HAVE_LOCALE_H setlocale(LC_ALL, ""); #endif -#if defined(HAVE__LOCALTIME64_S) - tmptr = _localtime64_s(&tmbuf, &mtime) ? NULL : &tmbuf; +#if defined(HAVE_LOCALTIME_S) + tmptr = localtime_s(&tmbuf, &mtime) ? NULL : &tmbuf; #elif defined(HAVE_LOCALTIME_R) tmptr = localtime_r(&mtime, &tmbuf); #else |