File 0001-Fix-64-bit-integer-types-on-32-bit-archs.p... of Package zfp

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-64-bit-integer-types-on-32-bit-archs.patch of Package zfp

From c6b630d84833d20dcbf1bae7c218ba17a6610fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 1 Oct 2022 05:39:05 +0200
Subject: [PATCH] Fix 64 bit integer types on 32 bit archs

In case the code is built with C89 on Linux LP32, 64 bit integers should
be defined as long long types. limits.h can be used to differentiate
between LP64 and LP32.
---
 include/zfp/internal/zfp/types.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/zfp/internal/zfp/types.h b/include/zfp/internal/zfp/types.h
index b209f37..a51260b 100644
--- a/include/zfp/internal/zfp/types.h
+++ b/include/zfp/internal/zfp/types.h
@@ -55,6 +55,7 @@ typedef unsigned long ulong;
   typedef int64_t int64;
   typedef uint64_t uint64;
 #else
+  #include <limits.h>
   /* C89: assume common integer types */
   typedef signed char int8;
   typedef unsigned char uint8;
@@ -69,9 +70,11 @@ typedef unsigned long ulong;
   #if defined(_WIN32)
     /* assume ILP32 or LLP64 (MSVC, MinGW) */
     #define ZFP_LLP64 1
-  #else
+  #elif ULONG_MAX > UINT_MAX
     /* assume LP64 (Linux, macOS, ...) */
     #define ZFP_LP64 1
+  #else
+    #define ZFP_LP32 1
   #endif
 
   /* concatenation for literal suffixes */
@@ -89,7 +92,7 @@ typedef unsigned long ulong;
     #define INT64PRId "ld"
     #define INT64PRIi "li"
     typedef signed long int64;
-  #elif ZFP_LLP64
+  #elif ZFP_LLP64 || ZFP_LP32
     #define INT64C(x) x ## ll
     #define INT64PRId "lld"
     #define INT64PRIi "lli"
@@ -115,7 +118,7 @@ typedef unsigned long ulong;
     #define UINT64PRIu "lu"
     #define UINT64PRIx "lx"
     typedef unsigned long uint64;
-  #elif ZFP_LLP64
+  #elif ZFP_LLP64 || ZFP_LP32
     #define UINT64C(x) x ## ull
     #define UINT64PRIo "llo"
     #define UINT64PRIu "llu"
-- 
2.37.3

Places

File 0001-Fix-64-bit-integer-types-on-32-bit-archs.patch of Package zfp

Places