diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | configure.in | 12 | ||||
-rw-r--r-- | defines.h | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,6 +1,7 @@ | |||
1 | 20000403 | 1 | 20000403 |
2 | - Wrote entropy collection routines for systems that lack /dev/random | 2 | - Wrote entropy collection routines for systems that lack /dev/random |
3 | and EGD | 3 | and EGD |
4 | - Disable tests and typedefs for 64 bit types. They are currently unused. | ||
4 | 5 | ||
5 | 20000401 | 6 | 20000401 |
6 | - Big OpenBSD CVS update (mainly beginnings of SSH2 infrastructure) | 7 | - Big OpenBSD CVS update (mainly beginnings of SSH2 infrastructure) |
diff --git a/configure.in b/configure.in index 6c9ea3129..1a2fcd2ca 100644 --- a/configure.in +++ b/configure.in | |||
@@ -304,7 +304,7 @@ AC_CHECK_SIZEOF(long long int, 8) | |||
304 | AC_MSG_CHECKING([for intXX_t types]) | 304 | AC_MSG_CHECKING([for intXX_t types]) |
305 | AC_TRY_COMPILE( | 305 | AC_TRY_COMPILE( |
306 | [#include <sys/types.h>], | 306 | [#include <sys/types.h>], |
307 | [int8_t a; int16_t b; int32_t c; int64_t d; a = b = c = d = 1;], | 307 | [int8_t a; int16_t b; int32_t c; a = b = c = 1;], |
308 | [ | 308 | [ |
309 | AC_DEFINE(HAVE_INTXX_T) | 309 | AC_DEFINE(HAVE_INTXX_T) |
310 | AC_MSG_RESULT(yes) | 310 | AC_MSG_RESULT(yes) |
@@ -316,7 +316,7 @@ AC_TRY_COMPILE( | |||
316 | AC_MSG_CHECKING([for u_intXX_t types]) | 316 | AC_MSG_CHECKING([for u_intXX_t types]) |
317 | AC_TRY_COMPILE( | 317 | AC_TRY_COMPILE( |
318 | [#include <sys/types.h>], | 318 | [#include <sys/types.h>], |
319 | [u_int8_t a; u_int16_t b; u_int32_t c; u_int64_t d; a = b = c = d = 1;], | 319 | [u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], |
320 | [ | 320 | [ |
321 | AC_DEFINE(HAVE_U_INTXX_T) | 321 | AC_DEFINE(HAVE_U_INTXX_T) |
322 | AC_MSG_RESULT(yes) | 322 | AC_MSG_RESULT(yes) |
@@ -332,9 +332,9 @@ then | |||
332 | AC_TRY_COMPILE( | 332 | AC_TRY_COMPILE( |
333 | [#include <sys/bitypes.h>], | 333 | [#include <sys/bitypes.h>], |
334 | [ | 334 | [ |
335 | int8_t a; int16_t b; int32_t c; int64_t d; | 335 | int8_t a; int16_t b; int32_t c; |
336 | u_int8_t e; u_int16_t f; u_int32_t g; u_int64_t h; | 336 | u_int8_t e; u_int16_t f; u_int32_t g; |
337 | a = b = c = d = e = f = g = h = 1; | 337 | a = b = c = e = f = g = 1; |
338 | ], | 338 | ], |
339 | [ | 339 | [ |
340 | AC_DEFINE(HAVE_U_INTXX_T) | 340 | AC_DEFINE(HAVE_U_INTXX_T) |
@@ -349,7 +349,7 @@ if test -z "$have_u_intxx_t" ; then | |||
349 | AC_MSG_CHECKING([for uintXX_t types]) | 349 | AC_MSG_CHECKING([for uintXX_t types]) |
350 | AC_TRY_COMPILE( | 350 | AC_TRY_COMPILE( |
351 | [#include <sys/types.h>], | 351 | [#include <sys/types.h>], |
352 | [uint8_t a; uint16_t b; uint32_t c; uint64_t d; a = b = c = d = 1;], | 352 | [uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;], |
353 | [ | 353 | [ |
354 | AC_DEFINE(HAVE_UINTXX_T) | 354 | AC_DEFINE(HAVE_UINTXX_T) |
355 | AC_MSG_RESULT(yes) | 355 | AC_MSG_RESULT(yes) |
@@ -75,6 +75,7 @@ typedef int int32_t; | |||
75 | # else | 75 | # else |
76 | # error "32 bit int type not found." | 76 | # error "32 bit int type not found." |
77 | # endif | 77 | # endif |
78 | /* | ||
78 | # if (SIZEOF_LONG_INT == 8) | 79 | # if (SIZEOF_LONG_INT == 8) |
79 | typedef long int int64_t; | 80 | typedef long int int64_t; |
80 | # else | 81 | # else |
@@ -85,6 +86,7 @@ typedef long long int int64_t; | |||
85 | # error "64 bit int type not found." | 86 | # error "64 bit int type not found." |
86 | # endif | 87 | # endif |
87 | # endif | 88 | # endif |
89 | */ | ||
88 | #endif | 90 | #endif |
89 | 91 | ||
90 | /* If sys/types.h does not supply u_intXX_t, supply them ourselves */ | 92 | /* If sys/types.h does not supply u_intXX_t, supply them ourselves */ |
@@ -93,7 +95,9 @@ typedef long long int int64_t; | |||
93 | typedef uint8_t u_int8_t; | 95 | typedef uint8_t u_int8_t; |
94 | typedef uint16_t u_int16_t; | 96 | typedef uint16_t u_int16_t; |
95 | typedef uint32_t u_int32_t; | 97 | typedef uint32_t u_int32_t; |
98 | /* | ||
96 | typedef uint64_t u_int64_t; | 99 | typedef uint64_t u_int64_t; |
100 | */ | ||
97 | # define HAVE_U_INTXX_T 1 | 101 | # define HAVE_U_INTXX_T 1 |
98 | # else | 102 | # else |
99 | # if (SIZEOF_CHAR == 1) | 103 | # if (SIZEOF_CHAR == 1) |
@@ -111,6 +115,7 @@ typedef unsigned int u_int32_t; | |||
111 | # else | 115 | # else |
112 | # error "32 bit int type not found." | 116 | # error "32 bit int type not found." |
113 | # endif | 117 | # endif |
118 | /* | ||
114 | # if (SIZEOF_LONG_INT == 8) | 119 | # if (SIZEOF_LONG_INT == 8) |
115 | typedef unsigned long int u_int64_t; | 120 | typedef unsigned long int u_int64_t; |
116 | # else | 121 | # else |
@@ -121,6 +126,7 @@ typedef unsigned long long int u_int64_t; | |||
121 | # error "64 bit int type not found." | 126 | # error "64 bit int type not found." |
122 | # endif | 127 | # endif |
123 | # endif | 128 | # endif |
129 | */ | ||
124 | # endif | 130 | # endif |
125 | #endif | 131 | #endif |
126 | 132 | ||