summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--defines.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cf9897d1..df2e7295e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 which don't have ECC support in libcrypto. 4 which don't have ECC support in libcrypto.
5 - (dtucker) [regress/cert-userkey.sh] Disable ECC-based tests on platforms 5 - (dtucker) [regress/cert-userkey.sh] Disable ECC-based tests on platforms
6 which don't have ECC support in libcrypto. 6 which don't have ECC support in libcrypto.
7 - (dtucker) [defines.h] Add SIZE_MAX for the benefit of platforms that don't
8 have it.
7 - (dtucker) OpenBSD CVS Sync 9 - (dtucker) OpenBSD CVS Sync
8 - sthen@cvs.openbsd.org 2010/10/23 22:06:12 10 - sthen@cvs.openbsd.org 2010/10/23 22:06:12
9 [sftp.c] 11 [sftp.c]
diff --git a/defines.h b/defines.h
index fe25170e6..49c901aff 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.160 2010/04/09 08:13:27 dtucker Exp $ */ 28/* $Id: defines.h,v 1.161 2010/10/24 00:58:44 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -250,6 +250,10 @@ typedef unsigned char u_char;
250#define SIZE_T_MAX ULONG_MAX 250#define SIZE_T_MAX ULONG_MAX
251#endif /* SIZE_T_MAX */ 251#endif /* SIZE_T_MAX */
252 252
253#ifndef SIZE_MAX
254#define SIZE_MAX UINT_MAX
255#endif
256
253#ifndef HAVE_SIZE_T 257#ifndef HAVE_SIZE_T
254typedef unsigned int size_t; 258typedef unsigned int size_t;
255# define HAVE_SIZE_T 259# define HAVE_SIZE_T