summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-03 15:57:06 +1000
committerDamien Miller <djm@mindrot.org>2000-04-03 15:57:06 +1000
commit70494d18eea315a70a7b7604080b8815d492b262 (patch)
tree06f98134de091ccf6f606e3aeb7de6047ca4eb32
parentecf6240b6d9837f1c7612f593e12677bf22a46d4 (diff)
- Disable tests and typedefs for 64 bit types. They are currently unused.V_1_2_3_TEST2
-rw-r--r--ChangeLog1
-rw-r--r--configure.in12
-rw-r--r--defines.h6
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 978c4082..d9d3ec3f 100644
--- 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 6c9ea312..1a2fcd2c 100644
--- 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 831fbaa9..b22d703f 100644
--- 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