pack: Use a user-configurable macro to select 64 bit packing.

diff --git a/src/pack.c b/src/pack.c
index 4490701756bce8134858c363b53bb21eac97d377..1128a19894465e1eb809522d24c8d2b88c08faca 100644 (file)
--- a/src/pack.c
+++ b/src/pack.c
@@ -8,9 +8,6 @@
  *  without any warranty.
  */
 
-#include <stdio.h>
-#include <limits.h>
-
 #include "pack.h"
 
 /* Unsigned integer packing. */
@@ -36,13 +33,13 @@
 
 DEFPACK_BE(16, unsigned short)
 DEFPACK_BE(32, unsigned long)
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 DEFPACK_BE(64, unsigned long long)
 #endif
 
 DEFPACK_LE(16, unsigned short)
 DEFPACK_LE(32, unsigned long)
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 DEFPACK_LE(64, unsigned long long)
 #endif
 
@@ -72,13 +69,13 @@ DEFPACK_LE(64, unsigned long long)
 
 DEFUNPACK_BE(16, unsigned short)
 DEFUNPACK_BE(32, unsigned long)
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 DEFUNPACK_BE(64, unsigned long long)
 #endif
 
 DEFUNPACK_LE(16, unsigned short)
 DEFUNPACK_LE(32, unsigned long)
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 DEFUNPACK_LE(64, unsigned long long)
 #endif
 
@@ -115,12 +112,12 @@ DEFUNPACK_LE(64, unsigned long long)
 
 DEFUNPACK_SBE(16, 32767, short)
 DEFUNPACK_SBE(32, 2147483647l, long)
-#ifdef LLONG_MAX
+#if PACK_HAVE_64BIT
 DEFUNPACK_SBE(64, 9223372036854775807ll, long long)
 #endif
 
 DEFUNPACK_SLE(16, 32767, short)
 DEFUNPACK_SLE(32, 2147483647l, long)
-#ifdef LLONG_MAX
+#if PACK_HAVE_64BIT
 DEFUNPACK_SLE(64, 9223372036854775807ll, long long)
 #endif

diff --git a/src/pack.h b/src/pack.h
index 8413fdb71c3c2b542484127c907697aa00e9049d..d47ddc4d6c927b8bc0b6f078faa3a0e83b26a70f 100644 (file)
--- a/src/pack.h
+++ b/src/pack.h
@@ -12,40 +12,43 @@
 #define PACK_H_
 
 #include <limits.h>
+#if !defined(PACK_HAVE_64BIT) && defined(ULLONG_MAX) && defined(LLONG_MAX)
+#      define PACK_HAVE_64BIT 1
+#endif
 
 void pack_16_be(unsigned char *, unsigned short);
 void pack_32_be(unsigned char *, unsigned long);
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 void pack_64_be(unsigned char *, unsigned long long);
 #endif
 
 void pack_16_le(unsigned char *, unsigned short);
 void pack_32_le(unsigned char *, unsigned long);
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 void pack_64_le(unsigned char *, unsigned long long);
 #endif
 
 unsigned short unpack_16_be(const unsigned char *);
 unsigned long  unpack_32_be(const unsigned char *);
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 unsigned long long unpack_64_be(const unsigned char *);
 #endif
 
 unsigned short unpack_16_le(const unsigned char *);
 unsigned long  unpack_32_le(const unsigned char *);
-#ifdef ULLONG_MAX
+#if PACK_HAVE_64BIT
 unsigned long long unpack_64_le(const unsigned char *);
 #endif
 
 short unpack_s16_be(const unsigned char *);
 long  unpack_s32_be(const unsigned char *);
-#ifdef LLONG_MAX
+#if PACK_HAVE_64BIT
 long long unpack_s64_be(const unsigned char *);
 #endif
 
 short unpack_s16_le(const unsigned char *);
 long  unpack_s32_le(const unsigned char *);
-#ifdef LLONG_MAX
+#if PACK_HAVE_64BIT
 long long unpack_s64_le(const unsigned char *);
 #endif