diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-01-04 18:49:44 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-01-04 18:49:44 +0000 |
| commit | 364168a8170646d16aa2183834fe1263b9d79b11 (patch) | |
| tree | 53176983e6e538c53d098045809563bc7dc96865 | |
| parent | 215763dd17b3de7196d1da78eaaeb46fcd816495 (diff) | |
| download | coreutils-364168a8170646d16aa2183834fe1263b9d79b11.tar.xz | |
* human.c (SIZE_MAX, UINTMAX_MAX): Move these conditional
definitions to be after all include files, to avoid collisions.
| -rw-r--r-- | lib/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/human.c | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 70092bac7..6a33a3f95 100644 --- 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. + 2005-01-04 Bob Proulx <bob@proulx.com> * obstack.c [DEFAULT_ALIGNMENT]: Use an intermediate type to simplify diff --git a/lib/human.c b/lib/human.c index 295e6de3c..6acc03243 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 <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 |