New include file minmax.h.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2b428dba03a300e717cc8f47cd3838d730d7f600..e32ea71d7085cdd3de21078b204a21209637087c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * minmax.h: New file, extracted from system.h.
+       * system.h (MIN, MAX): Remove macros.
+       * Makefile.am (libgettextlib_la_HEADER): Add minmax.h.
+
 2001-12-21  Bruno Haible  <bruno@clisp.org>
 
        * gettext.h: Moved here from ../intl/libgettext.h.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index dd11b2e4136beccfb22454bf132dcf322d7de3fb..a72fe859ba9056f36d15f26bcdc0a407a609e6c7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -32,9 +32,9 @@ xgetcwd.c xmalloc.c xstrdup.c
 
 libgettextlib_la_HEADER = argmatch.h backupfile.h basename.h c-ctype.h \
 copy-file.h execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h \
-javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h \
-pipe.h progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h \
-utf16-ucs4.h wait-process.h xerror.h xmalloc.h
+javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h minmax.h obstack.h \
+pathmax.h pipe.h progname.h safe-read.h sh-quote.h system.h tmpdir.h \
+utf8-ucs4.h utf16-ucs4.h wait-process.h xerror.h xmalloc.h
 
 # Sources that are compiled only on platforms that lack the functions.
 

diff --git a/lib/minmax.h b/lib/minmax.h
new file mode 100644 (file)
index 0000000..c4d2ad2
--- /dev/null
+++ b/lib/minmax.h
@@ -0,0 +1,49 @@
+/* MIN, MAX macros.
+   Copyright (C) 1995-1997, 2000, 2001 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _MINMAX_H
+#define _MINMAX_H
+
+/* Before we define the following symbols we get the <limits.h> file
+   since otherwise we get redefinitions on some systems.  */
+#include <limits.h>
+
+#ifndef MAX
+# if __STDC__ && defined __GNUC__ && __GNUC__ >= 2
+#  define MAX(a,b) (__extension__                                          \
+                    ({__typeof__ (a) _a = (a);                             \
+                      __typeof__ (b) _b = (b);                             \
+                      _a > _b ? _a : _b;                                   \
+                     }))
+# else
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+# endif
+#endif
+
+#ifndef MIN
+# if __STDC__ && defined __GNUC__ && __GNUC__ >= 2
+#  define MIN(a,b) (__extension__                                          \
+                    ({__typeof__ (a) _a = (a);                             \
+                      __typeof__ (b) _b = (b);                             \
+                      _a < _b ? _a : _b;                                   \
+                     }))
+# else
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
+# endif
+#endif
+
+#endif /* _MINMAX_H */

diff --git a/lib/system.h b/lib/system.h
index 47c19804c72c77a08bd55bd1679a1e1ab23a8abf..637ed0f2dfa0ad179ee9def9eb5801413a77e563 100644 (file)
--- a/lib/system.h
+++ b/lib/system.h
@@ -82,34 +82,6 @@ char *alloca ();
 # endif
 #endif
 
-/* Before we define the following symbols we get the <limits.h> file
-   since otherwise we get redefinitions on some systems.  */
-#include <limits.h>
-
-#ifndef MAX
-# if __STDC__ && defined __GNUC__ && __GNUC__ >= 2
-#  define MAX(a,b) (__extension__                                          \
-                    ({__typeof__ (a) _a = (a);                             \
-                      __typeof__ (b) _b = (b);                             \
-                      _a > _b ? _a : _b;                                   \
-                     }))
-# else
-#  define MAX(a,b) ((a) > (b) ? (a) : (b))
-# endif
-#endif
-
-#ifndef MIN
-# if __STDC__ && defined __GNUC__ && __GNUC__ >= 2
-#  define MIN(a,b) (__extension__                                          \
-                    ({__typeof__ (a) _a = (a);                             \
-                      __typeof__ (b) _b = (b);                             \
-                      _a < _b ? _a : _b;                                   \
-                     }))
-# else
-#  define MIN(a,b) ((a) < (b) ? (a) : (b))
-# endif
-#endif
-
 /* Some systems do not define EXIT_*, even with STDC_HEADERS.  */
 #ifndef EXIT_SUCCESS
 # define EXIT_SUCCESS 0

diff --git a/src/ChangeLog b/src/ChangeLog
index 83f73a0a1d5d49570f6dffb15b228075a640bc94..a6c506dff4fdcdc1c69438252e168fb79f1666bf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * format-lisp.c: Include minmax.h.
+
 2001-12-21  Bruno Haible  <bruno@clisp.org>
 
        * file-list.c: Include gettext.h instead of libgettext.h.

diff --git a/src/format-lisp.c b/src/format-lisp.c
index 79f3db6c0f221cb0b87e1e83897acb4874d308e4..58c4b8f1eea3c9710d2cfb7761cec7e1ef851f2f 100644 (file)
--- a/src/format-lisp.c
+++ b/src/format-lisp.c
@@ -27,6 +27,7 @@
 #include "c-ctype.h"
 #include "gcd.h"
 #include "xmalloc.h"
+#include "minmax.h"
 #include "system.h"
 #include "error.h"
 #include "progname.h"