summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--defines.h9
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54a894d44..feaf96eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
12 includes.h to pull in all of the compatibility stuff. 12 includes.h to pull in all of the compatibility stuff.
13 - (dtucker) [openbsd-compat/bcrypt_pbkdf.c] Wrap stdlib.h include inside 13 - (dtucker) [openbsd-compat/bcrypt_pbkdf.c] Wrap stdlib.h include inside
14 #ifdef HAVE_STDINT_H. 14 #ifdef HAVE_STDINT_H.
15 - (dtucker) [defines.h] Add typedefs for uintXX_t types for platforms that
16 don't have them.
15 17
1620140118 1820140118
17 - (djm) OpenBSD CVS Sync 19 - (djm) OpenBSD CVS Sync
diff --git a/defines.h b/defines.h
index b014f349b..66100c840 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.174 2013/11/07 02:28:16 djm Exp $ */ 28/* $Id: defines.h,v 1.175 2014/01/17 03:20:05 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -249,6 +249,13 @@ 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
252/* 64-bit types */ 259/* 64-bit types */
253#ifndef HAVE_INT64_T 260#ifndef HAVE_INT64_T
254# if (SIZEOF_LONG_INT == 8) 261# if (SIZEOF_LONG_INT == 8)