RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-25 19:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [defines.h] Move our definitions of uintXX_t types down to after

Browse Source 
they're defined if we have to define them ourselves.  Fixes builds on old
   AIX.
This commit is contained in:
Darren Tucker 2014-01-18 00:12:38 +11:00
parent a3357661ee
commit 355f861022
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -43,6 +43,9 @@
stack-protector since that has a separate flag that's been around a while.
- (dtucker) [readconf.c] Wrap paths.h inside an ifdef. Allows building on
Solaris.
- (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.
20140118
- (djm) OpenBSD CVS Sync

16
defines.h
View File

@ -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