Commit ba01e9d7 authored by Paul Eggert's avatar Paul Eggert

[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.
parent 08c69097
2011-02-21 Paul Eggert <eggert@cs.ucla.edu>
* lib/min-max.h: New file, for "min" and "max".
2011-02-20 Paul Eggert <eggert@cs.ucla.edu>
Import filemode module from gnulib.
......
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.
......
......@@ -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. */
......
......@@ -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)
......
#ifndef min
# define min(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef max
# define max(a,b) ((a) > (b) ? (a) : (b))
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment