From ea436f9fcf8c5d7a27459dfedf6bae87b21ef726 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 15 Nov 2001 16:35:19 +0000 Subject: [PATCH] Well the absolute correct solution would involve all of: int8, int16, int32, int64 and separately uint8, uint16, uint32, uint64 The previous patch grouped: int8, int16 and int32 uint8, uint16 and uint32 int64 and uint64 <-- this grouping is wrong on AIX 4.3.3 and below If you prefer to make 4 groups out of this you could apply this patch. Andreas --- configure.in | 2 ++ src/include/c.h | 14 +++++++------- src/include/pg_config.h.in | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index c223ce51b6..88b05db386 100644 --- a/configure.in +++ b/configure.in @@ -1174,6 +1174,8 @@ AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignme # doesn't work the way we want to. AC_CHECK_SIZEOF(int8, 0) AC_CHECK_SIZEOF(uint8, 0) +AC_CHECK_SIZEOF(int64, 0) +AC_CHECK_SIZEOF(uint64, 0) PGAC_FUNC_POSIX_SIGNALS diff --git a/src/include/c.h b/src/include/c.h index d4a67aa69f..65fde5a4d6 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.110 2001/11/15 16:09:34 momjian Exp $ + * $Id: c.h,v 1.111 2001/11/15 16:35:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -270,29 +270,29 @@ typedef double *float64; */ #ifdef HAVE_LONG_INT_64 /* Plain "long int" fits, use it */ -#if SIZEOF_INT8 == 0 +#if SIZEOF_INT64 == 0 typedef long int int64; #endif -#if SIZEOF_UINT8 == 0 +#if SIZEOF_UINT64 == 0 typedef unsigned long int uint64; #endif #else #ifdef HAVE_LONG_LONG_INT_64 /* We have working support for "long long int", use that */ -#if SIZEOF_INT8 == 0 +#if SIZEOF_INT64 == 0 typedef long long int int64; #endif -#if SIZEOF_UINT8 == 0 +#if SIZEOF_UINT64 == 0 typedef unsigned long long int uint64; #endif #else /* Won't actually work, but fall back to long int so that code compiles */ -#if SIZEOF_INT8 == 0 +#if SIZEOF_INT64 == 0 typedef long int int64; #endif -#if SIZEOF_UINT8 == 0 +#if SIZEOF_UINT64 == 0 typedef unsigned long int uint64; #endif diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index f33bd18f67..c513f4fc5b 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -8,7 +8,7 @@ * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your * changes will be overwritten the next time you run configure. * - * $Id: pg_config.h.in,v 1.12 2001/11/15 16:09:34 momjian Exp $ + * $Id: pg_config.h.in,v 1.13 2001/11/15 16:35:19 momjian Exp $ */ #ifndef PG_CONFIG_H @@ -699,6 +699,8 @@ extern int fdatasync(int fildes); #undef SIZEOF_INT8 #undef SIZEOF_UINT8 +#undef SIZEOF_INT64 +#undef SIZEOF_UINT64 /* *------------------------------------------------------------------------ -- 2.11.0