mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-22 07:09:54 +00:00
[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.
This commit is contained in:
parent
08c690977a
commit
ba01e9d785
@ -1,3 +1,7 @@
|
||||
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.
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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)
|
||||
|
6
lib/min-max.h
Normal file
6
lib/min-max.h
Normal file
@ -0,0 +1,6 @@
|
||||
#ifndef min
|
||||
# define min(a,b) ((a) < (b) ? (a) : (b))
|
||||
#endif
|
||||
#ifndef max
|
||||
# define max(a,b) ((a) > (b) ? (a) : (b))
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user