[ChangeLog]

* lib/min-max.h: New file, for "min" and "max".
[lib-src/ChangeLog]
New file "lib/min-max.h".
* ebrowse.c (min, max): Define them by including <min-max.h>
instead of defining it ourselves.
* pop.c (min): Likewise.

3 files changed, 8 insertions, 10 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c598164c575..81c6e6fe9b4 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
+        New file "lib/min-max.h".
+        * ebrowse.c (min, max): Define them by including <min-max.h>
+        instead of defining it ourselves.
+        * pop.c (min): Likewise.
+
         * movemail.c (popmail): Report fchown failure instead of ignoring it.
         But if the file already has the right ownership, don't worry about it.
 
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 2cb656ae53a..f2894d5a0c2 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -41,12 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define streq(X, Y) (*(X) == *(Y) && strcmp ((X) + 1, (Y) + 1) == 0)
 
-/* The ubiquitous `max' and `min' macros.  */
-
-#ifndef max
-#define max(X, Y)       ((X) > (Y) ? (X) : (Y))
-#define min(X, Y)       ((X) < (Y) ? (X) : (Y))
-#endif
+#include <min-max.h>
 
 /* Files are read in chunks of this number of bytes.  */
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 159926e97b0..426b39bd1fb 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -90,6 +90,8 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
 # endif
 #endif /* KERBEROS */
 
+#include <min-max.h>
+
 #ifdef KERBEROS
 #ifndef KERBEROS5
 extern int krb_sendauth (/* long, int, KTEXT, char *, char *, char *,
@@ -130,10 +132,6 @@ static char *find_crlf (char *, int);
 char pop_error[ERROR_MAX];
 int pop_debug = 0;
 
-#ifndef min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
 /*
  * Function: pop_open (char *host, char *username, char *password,
  *                     int flags)