*** ./configure.in.orig	Wed Nov  7 10:00:04 2001
--- ./configure.in	Thu Nov 15 17:02:01 2001
***************
*** 1169,1174 ****
--- 1169,1182 ----
  fi
  AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignment requirement of any type])
  
+ # Some platforms predefine the types int8, int16, etc.  Only check
+ # a (hopefully) representative subset.  Don't use AC_CHECK_TYPE, which
+ # 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
  
  
*** ./src/include/c.h.orig	Mon Nov 12 10:00:31 2001
--- ./src/include/c.h	Thu Nov 15 17:05:00 2001
***************
*** 205,215 ****
   *		used for numerical computations and the
   *		frontend/backend protocol.
   */
! #ifndef __BEOS__				/* this shouldn't be required, but is is! */
  typedef signed char int8;		/* == 8 bits */
  typedef signed short int16;		/* == 16 bits */
  typedef signed int int32;		/* == 32 bits */
! #endif   /* __BEOS__ */
  
  /*
   * uintN
--- 205,215 ----
   *		used for numerical computations and the
   *		frontend/backend protocol.
   */
! #if SIZEOF_INT8 == 0
  typedef signed char int8;		/* == 8 bits */
  typedef signed short int16;		/* == 16 bits */
  typedef signed int int32;		/* == 32 bits */
! #endif   /* SIZEOF_INT8 == 0 */
  
  /*
   * uintN
***************
*** 218,228 ****
   *		frontend/backend protocol.
   */
  /* Also defined in interfaces/odbc/md5.h */
! #ifndef __BEOS__				/* this shouldn't be required, but is is! */
  typedef unsigned char uint8;	/* == 8 bits */
  typedef unsigned short uint16;	/* == 16 bits */
  typedef unsigned int uint32;	/* == 32 bits */
! #endif   /* __BEOS__ */
  
  /*
   * boolN
--- 218,228 ----
   *		frontend/backend protocol.
   */
  /* Also defined in interfaces/odbc/md5.h */
! #if SIZEOF_UINT8 == 0
  typedef unsigned char uint8;	/* == 8 bits */
  typedef unsigned short uint16;	/* == 16 bits */
  typedef unsigned int uint32;	/* == 32 bits */
! #endif   /* SIZEOF_UINT8 == 0 */
  
  /*
   * boolN
***************
*** 268,294 ****
  /*
   * 64-bit integers
   */
- #ifndef __BEOS__				/* this is already defined on BeOS */
  #ifdef HAVE_LONG_INT_64
  /* Plain "long int" fits, use it */
  typedef long int int64;
  typedef unsigned long int uint64;
  
  #else
  #ifdef HAVE_LONG_LONG_INT_64
  /* We have working support for "long long int", use that */
  typedef long long int int64;
  typedef unsigned long long int uint64;
  
  #else
  /* Won't actually work, but fall back to long int so that code compiles */
  typedef long int int64;
  typedef unsigned long int uint64;
  
  #define INT64_IS_BUSTED
  #endif
  #endif
- #endif   /* __BEOS__ */
  
  /*
   * Size
--- 268,304 ----
  /*
   * 64-bit integers
   */
  #ifdef HAVE_LONG_INT_64
  /* Plain "long int" fits, use it */
+ #if SIZEOF_INT64 == 0
  typedef long int int64;
+ #endif
+ #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_INT64 == 0
  typedef long long int int64;
+ #endif
+ #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_INT64 == 0
  typedef long int int64;
+ #endif
+ #if SIZEOF_UINT64 == 0
  typedef unsigned long int uint64;
+ #endif
  
  #define INT64_IS_BUSTED
  #endif
  #endif
  
  /*
   * Size
*** ./src/include/pg_config.h.in.orig	Sun Oct 21 10:02:49 2001
--- ./src/include/pg_config.h.in	Thu Nov 15 17:02:34 2001
***************
*** 697,702 ****
--- 697,707 ----
  /* Define if you have on_exit() */
  #undef HAVE_ON_EXIT
  
+ #undef SIZEOF_INT8
+ #undef SIZEOF_UINT8
+ #undef SIZEOF_INT64
+ #undef SIZEOF_UINT64
+ 
  /*
   *------------------------------------------------------------------------
   * Part 4: pull in system-specific declarations.