X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fminmax.h;h=8ee442be4a74bd1eff6f6aaf0fec84844cedf00c;hb=d913c90f6a01f889db65cbb516683aab2f28c533;hp=63b55b4ee8fc3052d19e0c1083ff5b3c08e37937;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/minmax.h b/lib/minmax.h
index 63b55b4ee..8ee442be4 100644
--- a/lib/minmax.h
+++ b/lib/minmax.h
@@ -1,5 +1,6 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009, 2010 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,8 +25,15 @@
    #include this file as the last one among the #include list.  */
 
 /* Before we define the following symbols we get the <limits.h> file
-   since otherwise we get redefinitions on some systems.  */
-#include <limits.h>
+   since otherwise we get redefinitions on some systems if <limits.h> is
+   included after this file.  Likewise for <sys/param.h>.
+   If more than one of these system headers define MIN and MAX, pick just
+   one of the headers (because the definitions most likely are the same).  */
+#if HAVE_MINMAX_IN_LIMITS_H
+# include <limits.h>
+#elif HAVE_MINMAX_IN_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 /* Note: MIN and MAX should be used with two arguments of the
    same type.  They might not return the minimum and maximum of their two