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

[upkg.git] / src / pack.c

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