Skip to content

Commit a2d9a9b

Browse files
committed
Remove traces of BeOS.
Commit 15abc77 tolerated namespace pollution from BeOS system headers. Commit 44f9021 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
1 parent 9f34cae commit a2d9a9b

File tree

7 files changed

+0
-81
lines changed

7 files changed

+0
-81
lines changed

configure

-44
Original file line numberDiff line numberDiff line change
@@ -16784,50 +16784,6 @@ _ACEOF
1678416784

1678516785

1678616786

16787-
# Some platforms predefine the types int8, int16, etc. Only check
16788-
# a (hopefully) representative subset.
16789-
ac_fn_c_check_type "$LINENO" "int8" "ac_cv_type_int8" "#include <stdio.h>
16790-
"
16791-
if test "x$ac_cv_type_int8" = xyes; then :
16792-
16793-
cat >>confdefs.h <<_ACEOF
16794-
#define HAVE_INT8 1
16795-
_ACEOF
16796-
16797-
16798-
fi
16799-
ac_fn_c_check_type "$LINENO" "uint8" "ac_cv_type_uint8" "#include <stdio.h>
16800-
"
16801-
if test "x$ac_cv_type_uint8" = xyes; then :
16802-
16803-
cat >>confdefs.h <<_ACEOF
16804-
#define HAVE_UINT8 1
16805-
_ACEOF
16806-
16807-
16808-
fi
16809-
ac_fn_c_check_type "$LINENO" "int64" "ac_cv_type_int64" "#include <stdio.h>
16810-
"
16811-
if test "x$ac_cv_type_int64" = xyes; then :
16812-
16813-
cat >>confdefs.h <<_ACEOF
16814-
#define HAVE_INT64 1
16815-
_ACEOF
16816-
16817-
16818-
fi
16819-
ac_fn_c_check_type "$LINENO" "uint64" "ac_cv_type_uint64" "#include <stdio.h>
16820-
"
16821-
if test "x$ac_cv_type_uint64" = xyes; then :
16822-
16823-
cat >>confdefs.h <<_ACEOF
16824-
#define HAVE_UINT64 1
16825-
_ACEOF
16826-
16827-
16828-
fi
16829-
16830-
1683116787
# Some compilers offer a 128-bit integer scalar type.
1683216788
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128" >&5
1683316789
$as_echo_n "checking for __int128... " >&6; }

configure.ac

-5
Original file line numberDiff line numberDiff line change
@@ -1992,11 +1992,6 @@ fi
19921992
AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignment requirement of any C data type.])
19931993

19941994

1995-
# Some platforms predefine the types int8, int16, etc. Only check
1996-
# a (hopefully) representative subset.
1997-
AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
1998-
[#include <stdio.h>])
1999-
20001995
# Some compilers offer a 128-bit integer scalar type.
20011996
PGAC_TYPE_128BIT_INT
20021997

src/include/c.h

-12
Original file line numberDiff line numberDiff line change
@@ -491,23 +491,19 @@ typedef char *Pointer;
491491
* used for numerical computations and the
492492
* frontend/backend protocol.
493493
*/
494-
#ifndef HAVE_INT8
495494
typedef signed char int8; /* == 8 bits */
496495
typedef signed short int16; /* == 16 bits */
497496
typedef signed int int32; /* == 32 bits */
498-
#endif /* not HAVE_INT8 */
499497

500498
/*
501499
* uintN
502500
* Unsigned integer, EXACTLY N BITS IN SIZE,
503501
* used for numerical computations and the
504502
* frontend/backend protocol.
505503
*/
506-
#ifndef HAVE_UINT8
507504
typedef unsigned char uint8; /* == 8 bits */
508505
typedef unsigned short uint16; /* == 16 bits */
509506
typedef unsigned int uint32; /* == 32 bits */
510-
#endif /* not HAVE_UINT8 */
511507

512508
/*
513509
* bitsN
@@ -523,23 +519,15 @@ typedef uint32 bits32; /* >= 32 bits */
523519
#ifdef HAVE_LONG_INT_64
524520
/* Plain "long int" fits, use it */
525521

526-
#ifndef HAVE_INT64
527522
typedef long int int64;
528-
#endif
529-
#ifndef HAVE_UINT64
530523
typedef unsigned long int uint64;
531-
#endif
532524
#define INT64CONST(x) (x##L)
533525
#define UINT64CONST(x) (x##UL)
534526
#elif defined(HAVE_LONG_LONG_INT_64)
535527
/* We have working support for "long long int", use that */
536528

537-
#ifndef HAVE_INT64
538529
typedef long long int int64;
539-
#endif
540-
#ifndef HAVE_UINT64
541530
typedef unsigned long long int uint64;
542-
#endif
543531
#define INT64CONST(x) (x##LL)
544532
#define UINT64CONST(x) (x##ULL)
545533
#else

src/include/pg_config.h.in

-12
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,6 @@
199199
/* Define to 1 if you have the `inet_pton' function. */
200200
#undef HAVE_INET_PTON
201201

202-
/* Define to 1 if the system has the type `int64'. */
203-
#undef HAVE_INT64
204-
205-
/* Define to 1 if the system has the type `int8'. */
206-
#undef HAVE_INT8
207-
208202
/* Define to 1 if you have the <inttypes.h> header file. */
209203
#undef HAVE_INTTYPES_H
210204

@@ -457,12 +451,6 @@
457451
/* Define to 1 if you have the <ucred.h> header file. */
458452
#undef HAVE_UCRED_H
459453

460-
/* Define to 1 if the system has the type `uint64'. */
461-
#undef HAVE_UINT64
462-
463-
/* Define to 1 if the system has the type `uint8'. */
464-
#undef HAVE_UINT8
465-
466454
/* Define to 1 if the system has the type `union semun'. */
467455
#undef HAVE_UNION_SEMUN
468456

src/interfaces/ecpg/include/ecpg_config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
/* Define to 1 to build client libraries as thread-safe code. */
22
#define ENABLE_THREAD_SAFETY 1
33

4-
/* Define to 1 if the system has the type `int64'. */
5-
#undef HAVE_INT64
6-
74
/* Define to 1 if `long int' works and is 64 bits. */
85
#undef HAVE_LONG_INT_64
96

src/interfaces/ecpg/include/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
ecpg_inc = include_directories('.')
44

55
ecpg_conf_keys = [
6-
'HAVE_INT64',
76
'HAVE_LONG_INT_64',
87
'HAVE_LONG_LONG_INT_64',
98
'PG_USE_STDBOOL',

src/interfaces/ecpg/include/pgtypes_interval.h

-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@
99
#ifndef C_H
1010

1111
#ifdef HAVE_LONG_INT_64
12-
#ifndef HAVE_INT64
1312
typedef long int int64;
14-
#endif
1513
#elif defined(HAVE_LONG_LONG_INT_64)
16-
#ifndef HAVE_INT64
1714
typedef long long int int64;
18-
#endif
1915
#else
2016
/* neither HAVE_LONG_INT_64 nor HAVE_LONG_LONG_INT_64 */
2117
#error must have a working 64-bit integer datatype

0 commit comments

Comments
 (0)