2 files changed, 10 insertions, 14 deletions
diff --git a/src/include/config.h.in b/src/include/config.h.in
index f73058886c..5d2070c6b7 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -281,18 +281,15 @@ extern void srandom(unsigned int seed);
 /* Set to 1 if your DBL_MIN is problematic */
 #undef HAVE_DBL_MIN_PROBLEM
 
-/* Set to 1 if your snprintf has %lld for 'long long int' */
-#undef HAVE_INT64_AS_LLD
-
-/* Set to 1 if your snprintf has %qd for 'long long int' */
-#undef HAVE_INT64_AS_QD
-
 /* Set to 1 if type "long int" works and is 64 bits */
 #undef HAVE_LONG_INT_64
 
 /* Set to 1 if type "long long int" works and is 64 bits */
 #undef HAVE_LONG_LONG_INT_64
 
+/* Define this as the appropriate snprintf format for 64-bit ints, if any */
+#undef INT64_FORMAT
+
 /* Define as the base type of the last arg to accept */
 #undef SOCKET_SIZE_TYPE
 
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index 3ad1fd2cd4..db2e9edb52 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: int8.h,v 1.11 1999/03/08 04:17:33 scrappy Exp $
+ * $Id: int8.h,v 1.12 1999/03/15 01:43:05 tgl Exp $
  *
  * NOTES
  * These data types are supported on all 64-bit architectures, and may
@@ -27,26 +27,25 @@
 /* Plain "long int" fits, use it */
 typedef long int int64;
 
-#define INT64_FORMAT "%ld"
 #else
 #ifdef HAVE_LONG_LONG_INT_64
 /* We have working support for "long long int", use that */
 typedef long long int int64;
 
-#ifdef HAVE_INT64_AS_LLD
-# define INT64_FORMAT "%lld"
-#elif HAVE_INT64_AS_QD
-# define INT64_FORMAT "%qd"
-#endif
 #else
 /* Won't actually work, but fall back to long int so that int8.c compiles */
 typedef long int int64;
 
-#define INT64_FORMAT "%ld"
 #define INT64_IS_BUSTED
 #endif
 #endif
 
+/* this should be set in config.h: */
+#ifndef INT64_FORMAT
+#define INT64_FORMAT "%ld"
+#endif
+
+
 extern int64 *int8in(char *str);
 extern char *int8out(int64 * val);