diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 14:12:38 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-01-17 14:12:38 +0100 |
| commit | 355f861022be7b23d3009fae8f3c9f6f7fc685f7 (patch) | |
| tree | bef73db2927e632ba4e3cf93c60b7fd282839672 /defines.h | |
| parent | - (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building on (diff) | |
| download | openssh-355f861022be7b23d3009fae8f3c9f6f7fc685f7.tar.xz openssh-355f861022be7b23d3009fae8f3c9f6f7fc685f7.zip | |
- (dtucker) [defines.h] Move our definitions of uintXX_t types down to after
they're defined if we have to define them ourselves. Fixes builds on old
AIX.
Diffstat (limited to 'defines.h')
| -rw-r--r-- | defines.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.175 2014/01/17 03:20:05 dtucker Exp $ */ +/* $Id: defines.h,v 1.176 2014/01/17 13:12:38 dtucker Exp $ */ /* Constants */ @@ -249,13 +249,6 @@ typedef unsigned long u_int32_t; #define __BIT_TYPES_DEFINED__ #endif -#ifndef HAVE_UINTXX_T -typedef u_int8_t uint8_t; -typedef u_int16_t uint16_t; -typedef u_int32_t uint32_t; -typedef u_int64_t uint64_t; -#endif - /* 64-bit types */ #ifndef HAVE_INT64_T # if (SIZEOF_LONG_INT == 8) @@ -276,6 +269,13 @@ typedef unsigned long long int u_int64_t; # endif #endif +#ifndef HAVE_UINTXX_T +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; +typedef u_int64_t uint64_t; +#endif + #ifndef HAVE_INTMAX_T typedef long long intmax_t; #endif |