summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--defines.h16
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0af27d088..4eb859040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
43 stack-protector since that has a separate flag that's been around a while. 43 stack-protector since that has a separate flag that's been around a while.
44 - (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building on 44 - (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building on
45 Solaris. 45 Solaris.
46 - (dtucker) [defines.h] Move our definitions of uintXX_t types down to after
47 they're defined if we have to define them ourselves. Fixes builds on old
48 AIX.
46 49
4720140118 5020140118
48 - (djm) OpenBSD CVS Sync 51 - (djm) OpenBSD CVS Sync
diff --git a/defines.h b/defines.h
index 66100c840..354d5b614 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.175 2014/01/17 03:20:05 dtucker Exp $ */ 28/* $Id: defines.h,v 1.176 2014/01/17 13:12:38 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -249,13 +249,6 @@ typedef unsigned long u_int32_t;
249#define __BIT_TYPES_DEFINED__ 249#define __BIT_TYPES_DEFINED__
250#endif 250#endif
251 251
252#ifndef HAVE_UINTXX_T
253typedef u_int8_t uint8_t;
254typedef u_int16_t uint16_t;
255typedef u_int32_t uint32_t;
256typedef u_int64_t uint64_t;
257#endif
258
259/* 64-bit types */ 252/* 64-bit types */
260#ifndef HAVE_INT64_T 253#ifndef HAVE_INT64_T
261# if (SIZEOF_LONG_INT == 8) 254# if (SIZEOF_LONG_INT == 8)
@@ -276,6 +269,13 @@ typedef unsigned long long int u_int64_t;
276# endif 269# endif
277#endif 270#endif
278 271
272#ifndef HAVE_UINTXX_T
273typedef u_int8_t uint8_t;
274typedef u_int16_t uint16_t;
275typedef u_int32_t uint32_t;
276typedef u_int64_t uint64_t;
277#endif
278
279#ifndef HAVE_INTMAX_T 279#ifndef HAVE_INTMAX_T
280typedef long long intmax_t; 280typedef long long intmax_t;
281#endif 281#endif