summaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorTom Lane2010-01-07 04:53:35 +0000
committerTom Lane2010-01-07 04:53:35 +0000
commit901be0fad4034c9cf8a3588fd6cf2ece82e4b8ce (patch)
tree9d25bde7c4533c4be739a78ef14249b06b74e7f7 /src/interfaces
parentc282b36dd2a19a4bc05cc81cb4996081a1731d2e (diff)
Remove all the special-case code for INT64_IS_BUSTED, per decision that
we're not going to support that anymore. I did keep the 64-bit-CRC-with-32-bit-arithmetic code, since it has a performance excuse to live. It's a bit moot since that's all ifdef'd out, of course.
Diffstat (limited to 'src/interfaces')
-rw-r--r--src/interfaces/ecpg/include/pgtypes_interval.h22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/interfaces/ecpg/include/pgtypes_interval.h b/src/interfaces/ecpg/include/pgtypes_interval.h
index 3e5e6dc1639..0d6ab38603f 100644
--- a/src/interfaces/ecpg/include/pgtypes_interval.h
+++ b/src/interfaces/ecpg/include/pgtypes_interval.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_interval.h,v 1.14 2007/05/28 09:46:47 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_interval.h,v 1.15 2010/01/07 04:53:35 tgl Exp $ */
#ifndef PGTYPES_INTERVAL
#define PGTYPES_INTERVAL
@@ -12,28 +12,20 @@
typedef long int int64;
#endif
#elif defined(HAVE_LONG_LONG_INT_64)
-/* We have working support for "long long int", use that */
-
#ifndef HAVE_INT64
typedef long long int int64;
#endif
-#else /* not HAVE_LONG_INT_64 and not
- * HAVE_LONG_LONG_INT_64 */
-
-/* Won't actually work, but fall back to long int so that code compiles */
-#ifndef HAVE_INT64
-typedef long int int64;
+#else
+/* neither HAVE_LONG_INT_64 nor HAVE_LONG_LONG_INT_64 */
+#error must have a working 64-bit integer datatype
#endif
-#define INT64_IS_BUSTED
-#endif /* not HAVE_LONG_INT_64 and not
- * HAVE_LONG_LONG_INT_64 */
-#endif /* C_H */
-
-#if defined(USE_INTEGER_DATETIMES) && !defined(INT64_IS_BUSTED)
+#ifdef USE_INTEGER_DATETIMES
#define HAVE_INT64_TIMESTAMP
#endif
+#endif /* C_H */
+
typedef struct
{
#ifdef HAVE_INT64_TIMESTAMP