From 9f4832b3ebd775f394a6e3acb82db0548534d1e2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 4 Jan 2005 18:46:24 +0000 Subject: [PATCH] * human.c (SIZE_MAX, UINTMAX_MAX): Move these conditional definitions to be after all include files, to avoid collisions. --- lib/ChangeLog | 8 +++++++- lib/human.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 85b144d01c..0f72d0c991 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-01-04 Paul Eggert + + * human.c (SIZE_MAX, UINTMAX_MAX): Move these conditional + definitions to be after all include files, to avoid collisions. + Problem reported by Bob Proulx. + 2004-12-28 Paul Eggert * error.c [!_LIBC && !ENABLE_NLS]: Do not include "gettext.h"; @@ -5986,7 +5992,7 @@ shell quoting style. -Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/lib/human.c b/lib/human.c index 295e6de3c1..6acc03243c 100644 --- a/lib/human.c +++ b/lib/human.c @@ -1,6 +1,6 @@ /* human.c -- print human readable file size - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -25,13 +25,6 @@ #include "human.h" -#ifndef SIZE_MAX -# define SIZE_MAX ((size_t) -1) -#endif -#ifndef UINTMAX_MAX -# define UINTMAX_MAX ((uintmax_t) -1) -#endif - #include #include #include @@ -44,6 +37,13 @@ #include #include +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) +#endif +#ifndef UINTMAX_MAX +# define UINTMAX_MAX ((uintmax_t) -1) +#endif + /* The maximum length of a suffix like "KiB". */ #define HUMAN_READABLE_SUFFIX_LENGTH_MAX 3 -- 2.30.2