*** ./src/include/c.h.orig	Mon Nov 12 15:45:18 2001
--- ./src/include/c.h	Wed Nov 14 18:21:30 2001
***************
*** 266,290 ****
  /*
   * 64-bit integers
   */
- #if SIZEOF_INT64 == 0
  # if defined(HAVE_LONG_INT_64)
  /* Plain "long int" fits, use it */
  typedef long int int64;
  typedef unsigned long int uint64;
  
  # elif defined(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 /* SIZEOF_INT64 == 0 */
  
  /*
   * Size
--- 266,300 ----
  /*
   * 64-bit integers
   */
  # if defined(HAVE_LONG_INT_64)
  /* Plain "long int" fits, use it */
+ #if SIZEOF_INT64 == 0
  typedef long int int64;
+ #endif /* SIZEOF_INT64 == 0 */
+ #if SIZEOF_UINT64 == 0
  typedef unsigned long int uint64;
+ #endif /* SIZEOF_UINT64 == 0 */
  
  # elif defined(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 /* SIZEOF_INT64 == 0 */
+ #if SIZEOF_UINT64 == 0
  typedef unsigned long long int uint64;
+ #endif /* SIZEOF_UINT64 == 0 */
  
  # else
  /* Won't actually work, but fall back to long int so that code compiles */
+ #if SIZEOF_INT64 == 0
  typedef long int int64;
+ #endif /* SIZEOF_INT64 == 0 */
+ #if SIZEOF_UINT64 == 0
  typedef unsigned long int uint64;
+ #endif /* SIZEOF_UINT64 == 0 */
  
  #  define INT64_IS_BUSTED
  # endif
  
  /*
   * Size
*** ./src/include/pg_config.h.in.orig	Mon Nov 12 15:45:18 2001
--- ./src/include/pg_config.h.in	Wed Nov 14 18:24:33 2001
***************
*** 700,705 ****
--- 700,706 ----
  #undef SIZEOF_INT8
  #undef SIZEOF_UINT8
  #undef SIZEOF_INT64
+ #undef SIZEOF_UINT64
  
  
  /*
*** ./configure.in.orig	Mon Nov 12 15:45:18 2001
--- ./configure.in	Wed Nov 14 18:25:21 2001
***************
*** 1176,1181 ****
--- 1176,1182 ----
  AC_CHECK_SIZEOF(int8, 0)
  AC_CHECK_SIZEOF(uint8, 0)
  AC_CHECK_SIZEOF(int64, 0)
+ AC_CHECK_SIZEOF(uint64, 0)
  
  
  PGAC_FUNC_POSIX_SIGNALS