New include file minmax.h.

4 files changed, 58 insertions, 31 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2b428db..e32ea71 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,11 @@
 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.
 	* Makefile.am (noinst_HEADERS): Add it.
 	(gettextsrcdir, gettextsrc_DATA): New variables.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index dd11b2e..a72fe85 100644
--- 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
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 47c1980..637ed0f 100644
--- 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