passwordsafe: fix with recent glibc

This commit is contained in:
q66 2020-01-02 01:41:40 +01:00
parent 7ba02993da
commit d027405b1d

View file

@ -1,22 +1,24 @@
related issue: https://github.com/pwsafe/pwsafe/issues/563 related issue: https://github.com/pwsafe/pwsafe/issues/563
commit 497246d4beffcd9347b443b1622e4ea64a7b389c Also:
Author: ronys <ronys@pwsafe.org>
Date: Fri Jul 5 22:23:28 2019 +0300
Fix GH563: broken build on 32 bit gcc 9.1 https://github.com/pwsafe/pwsafe/commit/412458d281f98ea7649d2957f88ebad701b6cd18
diff --git src/os/unix/pws_time.h src/os/unix/pws_time.h
index 4be9ffb90..683cb48b9 100644
--- src/os/unix/pws_time.h --- src/os/unix/pws_time.h
+++ src/os/unix/pws_time.h +++ src/os/unix/pws_time.h
@@ -14,8 +14,7 @@ @@ -14,9 +14,11 @@
#include <time.h> #include <time.h>
#endif #endif
-typedef time_t __time32_t; -typedef time_t __time32_t;
-#ifndef __time64_t -#ifndef __time64_t
+#if !defined(__time64_t) && !defined(__TIME64_T_TYPE) -typedef uint64_t __time64_t;
typedef uint64_t __time64_t; +#ifndef __TIME64_T_TYPE
+#define __TIME64_T_TYPE uint64_t
+#endif
+#ifndef time64_t
+typedef __TIME64_T_TYPE __time64_t;
#endif #endif
extern int localtime64_r(const __time64_t *timep, struct tm *result);