Remove traces of BeOS.

Commit 15abc7788e6 tolerated namespace pollution from BeOS system
headers.  Commit 44f902122 de-supported BeOS.  Since that stuff didn't
make it into the Meson build system, synchronize by removing from
configure.

Author: Thomas Munro <[email protected]>
Reviewed-by: Peter Eisentraut <[email protected]>
Reviewed-by: Heikki Linnakangas <[email protected]>
Reviewed-by: Japin Li <[email protected]>
Reviewed-by: Tom Lane <[email protected]> (the idea, not the patch)
Discussion: https://postgr.es/m/ME3P282MB3166F9D1F71F787929C0C7E7B6312%40ME3P282MB3166.AUSP282.PROD.OUTLOOK.COM

diff --git a/configure b/configure
index c9577313e4db1f16091587403f2387e1c91d919a..3a577e463ba5d8d57aa3df8ab53c80d54a857950 100755 (executable)
--- a/configure
+++ b/configure
@@ -16784,50 +16784,6 @@ _ACEOF
 
 
 
-# Some platforms predefine the types int8, int16, etc.  Only check
-# a (hopefully) representative subset.
-ac_fn_c_check_type "$LINENO" "int8" "ac_cv_type_int8" "#include <stdio.h>
-"
-if test "x$ac_cv_type_int8" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT8 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "uint8" "ac_cv_type_uint8" "#include <stdio.h>
-"
-if test "x$ac_cv_type_uint8" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT8 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "int64" "ac_cv_type_int64" "#include <stdio.h>
-"
-if test "x$ac_cv_type_int64" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT64 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "uint64" "ac_cv_type_uint64" "#include <stdio.h>
-"
-if test "x$ac_cv_type_uint64" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT64 1
-_ACEOF
-
-
-fi
-
-
 # Some compilers offer a 128-bit integer scalar type.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128" >&5
 $as_echo_n "checking for __int128... " >&6; }

diff --git a/configure.ac b/configure.ac
index 382984f594c6a51ce9854eb355a592c6c2ff9390..55f6c46d3334b1dc3c7407dd5c71ab669debabb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1992,11 +1992,6 @@ fi
 AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignment requirement of any C data type.])
 
 
-# Some platforms predefine the types int8, int16, etc.  Only check
-# a (hopefully) representative subset.
-AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
-[#include <stdio.h>])
-
 # Some compilers offer a 128-bit integer scalar type.
 PGAC_TYPE_128BIT_INT
 

diff --git a/src/include/c.h b/src/include/c.h
index 3297d89ff0e1b7ddd716c9bc55b408ca07f6ef03..55dec71a6d7fc6a0cf5ff08e87762ecda8653587 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -491,11 +491,9 @@ typedef char *Pointer;
  *     used for numerical computations and the
  *     frontend/backend protocol.
  */
-#ifndef HAVE_INT8
 typedef signed char int8;      /* == 8 bits */
 typedef signed short int16;        /* == 16 bits */
 typedef signed int int32;      /* == 32 bits */
-#endif                         /* not HAVE_INT8 */
 
 /*
  * uintN
@@ -503,11 +501,9 @@ typedef signed int int32;      /* == 32 bits */
  *     used for numerical computations and the
  *     frontend/backend protocol.
  */
-#ifndef HAVE_UINT8
 typedef unsigned char uint8;   /* == 8 bits */
 typedef unsigned short uint16; /* == 16 bits */
 typedef unsigned int uint32;   /* == 32 bits */
-#endif                         /* not HAVE_UINT8 */
 
 /*
  * bitsN
@@ -523,23 +519,15 @@ typedef uint32 bits32;            /* >= 32 bits */
 #ifdef HAVE_LONG_INT_64
 /* Plain "long int" fits, use it */
 
-#ifndef HAVE_INT64
 typedef long int int64;
-#endif
-#ifndef HAVE_UINT64
 typedef unsigned long int uint64;
-#endif
 #define INT64CONST(x)  (x##L)
 #define UINT64CONST(x) (x##UL)
 #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
-#ifndef HAVE_UINT64
 typedef unsigned long long int uint64;
-#endif
 #define INT64CONST(x)  (x##LL)
 #define UINT64CONST(x) (x##ULL)
 #else

diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 6c04347d4e72695bf252292a8e3a7bc3e1e615dc..427030f31a76b24ebb35ef54b6d61095df0fcaf0 100644 (file)
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -199,12 +199,6 @@
 /* Define to 1 if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Define to 1 if the system has the type `int64'. */
-#undef HAVE_INT64
-
-/* Define to 1 if the system has the type `int8'. */
-#undef HAVE_INT8
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -457,12 +451,6 @@
 /* Define to 1 if you have the <ucred.h> header file. */
 #undef HAVE_UCRED_H
 
-/* Define to 1 if the system has the type `uint64'. */
-#undef HAVE_UINT64
-
-/* Define to 1 if the system has the type `uint8'. */
-#undef HAVE_UINT8
-
 /* Define to 1 if the system has the type `union semun'. */
 #undef HAVE_UNION_SEMUN
 

diff --git a/src/interfaces/ecpg/include/ecpg_config.h.in b/src/interfaces/ecpg/include/ecpg_config.h.in
index 824617b9175289ee79c81651db2088b06173ee76..2b439c1e58d7136ca84f96ca6d58f4f2def17925 100644 (file)
--- a/src/interfaces/ecpg/include/ecpg_config.h.in
+++ b/src/interfaces/ecpg/include/ecpg_config.h.in
@@ -1,9 +1,6 @@
 /* Define to 1 to build client libraries as thread-safe code. */
 #define ENABLE_THREAD_SAFETY 1
 
-/* Define to 1 if the system has the type `int64'. */
-#undef HAVE_INT64
-
 /* Define to 1 if `long int' works and is 64 bits. */
 #undef HAVE_LONG_INT_64
 

diff --git a/src/interfaces/ecpg/include/meson.build b/src/interfaces/ecpg/include/meson.build
index 31610fef5892949d6bf8fc5d40dd9c0322a01178..b4a5aedd51fe802aa24fb205ad701699868f4411 100644 (file)
--- a/src/interfaces/ecpg/include/meson.build
+++ b/src/interfaces/ecpg/include/meson.build
@@ -3,7 +3,6 @@
 ecpg_inc = include_directories('.')
 
 ecpg_conf_keys = [
-  'HAVE_INT64',
   'HAVE_LONG_INT_64',
   'HAVE_LONG_LONG_INT_64',
   'PG_USE_STDBOOL',

diff --git a/src/interfaces/ecpg/include/pgtypes_interval.h b/src/interfaces/ecpg/include/pgtypes_interval.h
index 2809b356f73535bb0735a499b9423b395f00c414..46cfce655174e656ecda71ba9aa1ea5f37ff644b 100644 (file)
--- a/src/interfaces/ecpg/include/pgtypes_interval.h
+++ b/src/interfaces/ecpg/include/pgtypes_interval.h
@@ -9,13 +9,9 @@
 #ifndef C_H
 
 #ifdef HAVE_LONG_INT_64
-#ifndef HAVE_INT64
 typedef long int int64;
-#endif
 #elif defined(HAVE_LONG_LONG_INT_64)
-#ifndef HAVE_INT64
 typedef long long int int64;
-#endif
 #else
 /* neither HAVE_LONG_INT_64 nor HAVE_LONG_LONG_INT_64 */
 #error must have a working 64-bit integer datatype