From 54b1f3121df1317627a52d9b6d1d854ad977cf76 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 25 Oct 2010 16:54:28 +1100 Subject: [PATCH] - (dtucker) [defines.h] Use SIZE_T_MAX for SIZE_MAX for platforms that have a native one. --- ChangeLog | 2 ++ defines.h | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f48cbb5c9..bed73463a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with 1.12 to unbreak Solaris build. ok djm@ + - (dtucker) [defines.h] Use SIZE_T_MAX for SIZE_MAX for platforms that have a + native one. 20101024 - (dtucker) [includes.h] Add missing ifdef GLOB_HAS_GL_STATV to fix build. diff --git a/defines.h b/defines.h index 49c901aff..61203c3fe 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.161 2010/10/24 00:58:44 dtucker Exp $ */ +/* $Id: defines.h,v 1.162 2010/10/25 05:54:28 dtucker Exp $ */ /* Constants */ @@ -250,16 +250,16 @@ typedef unsigned char u_char; #define SIZE_T_MAX ULONG_MAX #endif /* SIZE_T_MAX */ -#ifndef SIZE_MAX -#define SIZE_MAX UINT_MAX -#endif - #ifndef HAVE_SIZE_T typedef unsigned int size_t; # define HAVE_SIZE_T # define SIZE_T_MAX UINT_MAX #endif /* HAVE_SIZE_T */ +#ifndef SIZE_MAX +#define SIZE_MAX SIZE_T_MAX +#endif + #ifndef HAVE_SSIZE_T typedef int ssize_t; # define HAVE_SSIZE_T