Mercurial > hg > octave-kai > gnulib-hg
changeset 5569:5b0578864f09
* human.c (SIZE_MAX, UINTMAX_MAX): Move these conditional
definitions to be after all include files, to avoid collisions.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 04 Jan 2005 18:46:24 +0000 |
| parents | 1d93e5595f5c |
| children | 6bfb33d2482d |
| files | lib/ChangeLog lib/human.c |
| diffstat | 2 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-01-04 Paul Eggert <eggert@cs.ucla.edu> + + * 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 <eggert@cs.ucla.edu> * 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.
--- 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 <locale.h> #include <stdio.h> #include <stdlib.h> @@ -44,6 +37,13 @@ #include <error.h> #include <xstrtol.h> +#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