aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-08-23 22:25:54 +0000
committerBruce Momjian <bruce@momjian.us>1998-08-23 22:25:54 +0000
commit07ae591c87ad256a5c9b081a3eb14ba5549d273f (patch)
treeb59cc37ca712b4fe248db0484e4641870dd0a18b /src
parent9cad9febb172b09ff8c2366a4e19469926304f0d (diff)
downloadpostgresql-07ae591c87ad256a5c9b081a3eb14ba5549d273f.tar.gz
postgresql-07ae591c87ad256a5c9b081a3eb14ba5549d273f.zip
Attached is a patch that uses autoconf to determine whether there
is a working 64-bit-int type available. In playing around with it on my machine, I found that gcc provides perfectly fine support for "long long" arithmetic ... but sprintf() and sscanf(), which are system-supplied, don't work :-(. So the autoconf test program does a cursory test on them too. If we find that a lot of systems are like this, it might be worth the trouble to implement binary<->ASCII conversion of int64 ourselves rather than relying on sprintf/sscanf to handle the data type. regards, tom lane
Diffstat (limited to 'src')
-rw-r--r--src/backend/parser/gram.c2
-rw-r--r--src/backend/parser/scan.c4
-rw-r--r--src/configure.in78
-rw-r--r--src/include/config.h.in6
-rw-r--r--src/include/utils/int8.h23
5 files changed, 94 insertions, 19 deletions
diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index fe45472fea0..d18687dc73f 100644
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -219,7 +219,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.27 1998/08/19 14:51:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.28 1998/08/23 22:25:47 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
diff --git a/src/backend/parser/scan.c b/src/backend/parser/scan.c
index cede710c44e..0b9e8b41542 100644
--- a/src/backend/parser/scan.c
+++ b/src/backend/parser/scan.c
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.23 1998/08/17 03:50:15 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.24 1998/08/23 22:25:51 momjian Exp $
*/
#define FLEX_SCANNER
@@ -555,7 +555,7 @@ char *yytext;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.23 1998/08/17 03:50:15 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.24 1998/08/23 22:25:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/configure.in b/src/configure.in
index 423faada999..b81d129ef33 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -522,7 +522,83 @@ AC_TRY_RUN([#include <stdlib.h>
#endif
main() { double d = DBL_MIN; if (d != DBL_MIN) exit(-1); else exit(0); }],
AC_MSG_RESULT(yes),
- [AC_MSG_RESULT(no) AC_DEFINE(HAVE_DBL_MIN_PROBLEM)])
+ [AC_MSG_RESULT(no) AC_DEFINE(HAVE_DBL_MIN_PROBLEM)],
+ AC_MSG_RESULT(assuming ok on target machine))
+
+dnl Check to see if we have a working 64-bit integer type.
+AC_MSG_CHECKING(whether 'long int' is 64 bits)
+AC_TRY_RUN([#include <stdio.h>
+typedef long int int64;
+#define INT64_FORMAT "%ld"
+
+int64 a = 20000001;
+int64 b = 40000005;
+
+int does_int64_work()
+{
+ int64 c,d,e;
+ char buf[100];
+
+ if (sizeof(int64) != 8)
+ return 0; /* doesn't look like the right size */
+
+ /* we do perfunctory checks on multiply, divide, sprintf, sscanf */
+ c = a * b;
+ sprintf(buf, INT64_FORMAT, c);
+ if (strcmp(buf, "800000140000005") != 0)
+ return 0; /* either multiply or sprintf is busted */
+ if (sscanf(buf, INT64_FORMAT, &d) != 1)
+ return 0;
+ if (d != c)
+ return 0;
+ e = d / b;
+ if (e != a)
+ return 0;
+ return 1;
+}
+main() {
+ exit(! does_int64_work());
+}],
+ [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LONG_INT_64)],
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(assuming not on target machine))
+
+AC_MSG_CHECKING(whether 'long long int' is 64 bits)
+AC_TRY_RUN([#include <stdio.h>
+typedef long long int int64;
+#define INT64_FORMAT "%Ld"
+
+int64 a = 20000001;
+int64 b = 40000005;
+
+int does_int64_work()
+{
+ int64 c,d,e;
+ char buf[100];
+
+ if (sizeof(int64) != 8)
+ return 0; /* doesn't look like the right size */
+
+ /* we do perfunctory checks on multiply, divide, sprintf, sscanf */
+ c = a * b;
+ sprintf(buf, INT64_FORMAT, c);
+ if (strcmp(buf, "800000140000005") != 0)
+ return 0; /* either multiply or sprintf is busted */
+ if (sscanf(buf, INT64_FORMAT, &d) != 1)
+ return 0;
+ if (d != c)
+ return 0;
+ e = d / b;
+ if (e != a)
+ return 0;
+ return 1;
+}
+main() {
+ exit(! does_int64_work());
+}],
+ [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LONG_LONG_INT_64)],
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(assuming not on target machine))
dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL
diff --git a/src/include/config.h.in b/src/include/config.h.in
index c849b078325..f8836576cfe 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -219,6 +219,12 @@ extern void srandom(int seed);
/* Set to 1 if your DBL_MIN is problematic */
#undef HAVE_DBL_MIN_PROBLEM
+/* 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
+
/*
* Code below this point should not require changes
*/
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index e285754d2ee..dff02b71206 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.1 1998/07/08 14:10:30 thomas Exp $
+ * $Id: int8.h,v 1.2 1998/08/23 22:25:54 momjian Exp $
*
* NOTES
* These data types are supported on all 64-bit architectures, and may
@@ -23,29 +23,22 @@
#ifndef INT8_H
#define INT8_H
-#if defined(__alpha) || defined(PPC)
+#ifdef HAVE_LONG_INT_64
+/* Plain "long int" fits, use it */
typedef long int int64;
-
#define INT64_FORMAT "%ld"
-
-#elif defined(__GNUC__) && defined(i386)
+#else
+#ifdef HAVE_LONG_LONG_INT_64
+/* We have working support for "long long int", use that */
typedef long long int int64;
-
#define INT64_FORMAT "%Ld"
-
#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
-
-
-/*
-#if sizeof(int64) == 8
-#define HAVE_64BIT_INTS 1
#endif
-*/
-
extern int64 *int8in(char *str);
extern char *int8out(int64 * val);