Add autoconf tests for the 'minmax' module.

diff --git a/ChangeLog b/ChangeLog
index 4ac35e0ee1485c0e434b779b300ea8b54cff9c6e..40eb5a4aa3f8c5d1af83fa7793a558001a941d90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-18  Derek Price  <derek@ximbiot.com>
+
+       * modules/minmax (Files): Add m4/minmax.m4.
+       (configure.ac): Add gl_MINMAX.
+
 2005-05-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * MODULES.html.sh (File system functions): Add fts, fts-lgpl.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index eda3c447414c1b562d1feb43651a88335940db54..f938e2d3049235e8ac868e9b1593fc1c0ba64704 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-22  Bruno Haible  <bruno@clisp.org>
+
+       * minmax.h: Include <limits.h> only when it defines MIN, MAX.
+       Also include <sys/param.h> if it defines MIN, MAX.
+       Based on a patch by Derek Price <derek@ximbiot.com>.
+
 2005-05-22  Bruno Haible  <bruno@clisp.org>
 
        * stdint_.h (_STDINT_H_HAVE_INT64): New macro. Use it in #ifdefs.

diff --git a/lib/minmax.h b/lib/minmax.h
index 63b55b4ee8fc3052d19e0c1083ff5b3c08e37937..975ea76d131d16bf896fc982fa999812eb78d162 100644 (file)
--- a/lib/minmax.h
+++ b/lib/minmax.h
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1998, 2001, 2003, 2005 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 +24,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

diff --git a/m4/ChangeLog b/m4/ChangeLog
index de96461ecdaca5462b0c4f3bb0f4854a2983ba7d..930047e7f88dbeee7ab7b0796ece3a7039f78f29 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-22  Bruno Haible  <bruno@clisp.org>
+
+       * minmax.m4: New file.
+       Based on a patch by Derek Price <derek@ximbiot.com>.
+
 2005-05-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * fts.m4 (gl_FUNC_FTS_CORE): Renamed from gl_FUNC_FTS.
@@ -4224,4 +4229,4 @@
 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
   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.
+are permitted provided the copyright notice and this notice are preserved.
\ No newline at end of file

diff --git a/modules/minmax b/modules/minmax
index 3cf650256f4cd851c09158da75c82e8acf5788df..5b122b76c6eec5cadca220dd7f8330d276dd4af4 100644 (file)
--- a/modules/minmax
+++ b/modules/minmax
@@ -3,10 +3,12 @@ MIN, MAX macros.
 
 Files:
 lib/minmax.h
+m4/minmax.m4
 
 Depends-on:
 
 configure.ac:
+gl_MINMAX
 
 Makefile.am:
 lib_SOURCES += minmax.h