- Disable tests and typedefs for 64 bit types. They are currently unused.

diff --git a/ChangeLog b/ChangeLog
index 978c40828f1fcf2167c525e82c846446d7e57bd9..d9d3ec3f17e0213a0b81e3841cd8bf9f788a88e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20000403
  - Wrote entropy collection routines for systems that lack /dev/random
    and EGD
+ - Disable tests and typedefs for 64 bit types. They are currently unused.
 
 20000401
  - Big OpenBSD CVS update (mainly beginnings of SSH2 infrastructure)

diff --git a/configure.in b/configure.in
index 6c9ea3129af48aec8fe7ad5a1f3c51df858acd01..1a2fcd2ca2e009d52f2c59e6b196a9e50b816817 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -304,7 +304,7 @@ AC_CHECK_SIZEOF(long long int, 8)
 AC_MSG_CHECKING([for intXX_t types])
 AC_TRY_COMPILE(
        [#include <sys/types.h>], 
-       [int8_t a; int16_t b; int32_t c; int64_t d; a = b = c = d = 1;], 
+       [int8_t a; int16_t b; int32_t c; a = b = c = 1;], 
        [
                AC_DEFINE(HAVE_INTXX_T)
                AC_MSG_RESULT(yes)
@@ -316,7 +316,7 @@ AC_TRY_COMPILE(
 AC_MSG_CHECKING([for u_intXX_t types])
 AC_TRY_COMPILE(
        [#include <sys/types.h>], 
-       [u_int8_t a; u_int16_t b; u_int32_t c; u_int64_t d; a = b = c = d = 1;], 
+       [u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], 
        [
                AC_DEFINE(HAVE_U_INTXX_T)
                AC_MSG_RESULT(yes)
@@ -332,9 +332,9 @@ then
        AC_TRY_COMPILE(
                [#include <sys/bitypes.h>], 
                [
-                       int8_t a; int16_t b; int32_t c; int64_t d;
-                       u_int8_t e; u_int16_t f; u_int32_t g; u_int64_t h; 
-                       a = b = c = d = e = f = g = h = 1;
+                       int8_t a; int16_t b; int32_t c;
+                       u_int8_t e; u_int16_t f; u_int32_t g;
+                       a = b = c = e = f = g = 1;
                ], 
                [
                        AC_DEFINE(HAVE_U_INTXX_T)
@@ -349,7 +349,7 @@ if test -z "$have_u_intxx_t" ; then
        AC_MSG_CHECKING([for uintXX_t types])
        AC_TRY_COMPILE(
                [#include <sys/types.h>], 
-               [uint8_t a; uint16_t b; uint32_t c; uint64_t d; a = b = c = d = 1;], 
+               [uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;], 
                [
                        AC_DEFINE(HAVE_UINTXX_T)
                        AC_MSG_RESULT(yes)

diff --git a/defines.h b/defines.h
index 831fbaa9e61b3e3b6f7396926a1913bd9cec9e85..b22d703f5f444016fe214914d15daa70a670de8e 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -75,6 +75,7 @@ typedef int int32_t;
 # else
 #  error "32 bit int type not found."
 # endif
+/*
 # if (SIZEOF_LONG_INT == 8)
 typedef long int int64_t;
 # else
@@ -85,6 +86,7 @@ typedef long long int int64_t;
 #   error "64 bit int type not found."
 #  endif
 # endif
+*/
 #endif
 
 /* If sys/types.h does not supply u_intXX_t, supply them ourselves */
@@ -93,7 +95,9 @@ typedef long long int int64_t;
 typedef uint8_t u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
+/*
 typedef  uint64_t u_int64_t;
+*/
 # define HAVE_U_INTXX_T 1
 # else
 #  if (SIZEOF_CHAR == 1)
@@ -111,6 +115,7 @@ typedef unsigned int u_int32_t;
 #  else
 #   error "32 bit int type not found."
 #  endif
+/*
 #  if (SIZEOF_LONG_INT == 8)
 typedef unsigned long int u_int64_t;
 #  else
@@ -121,6 +126,7 @@ typedef unsigned long long int u_int64_t;
 #    error "64 bit int type not found."
 #   endif
 #  endif
+*/
 # endif
 #endif