* human.c (SIZE_MAX, UINTMAX_MAX): Move these conditional

definitions to be after all include files, to avoid collisions.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 70092bac774684769e1763f94e3ede018f26933d..6a33a3f951507d914579738cdc5bc44a2676b381 100644 (file)
--- 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 295e6de3c1343d872c5a60533613372d9be95ff4..6acc03243cf65adb4d92d4e5f4801953d2db0db5 100644 (file)
--- 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