Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ChangeLog]

Browse source 
* 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:
Paul Eggert 2011-02-21 15:22:34 -08:00
parent 08c690977a
commit ba01e9d785
5 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2011-02-20 Paul Eggert <eggert@cs.ucla.edu>
Import filemode module from gnulib. Import filemode module from gnulib.

5
lib-src/ChangeLog
View file

@ -1,5 +1,10 @@
2011-02-21 Paul Eggert <eggert@cs.ucla.edu> 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. * movemail.c (popmail): Report fchown failure instead of ignoring it.
But if the file already has the right ownership, don't worry about it. But if the file already has the right ownership, don't worry about it.

7
lib-src/ebrowse.c
View file

@ -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) #define streq(X, Y) (*(X) == *(Y) && strcmp ((X) + 1, (Y) + 1) == 0)
/* The ubiquitous `max' and `min' macros. */ #include <min-max.h>
#ifndef max
#define max(X, Y) ((X) > (Y) ? (X) : (Y))
#define min(X, Y) ((X) < (Y) ? (X) : (Y))
#endif
/* Files are read in chunks of this number of bytes. */ /* Files are read in chunks of this number of bytes. */

6
lib-src/pop.c
View file

@ -90,6 +90,8 @@ extern struct servent *hes_getservbyname (/* char *, char * */);
# endif # endif
#endif /* KERBEROS */ #endif /* KERBEROS */
#include <min-max.h>
#ifdef KERBEROS #ifdef KERBEROS
#ifndef KERBEROS5 #ifndef KERBEROS5
extern int krb_sendauth (/* long, int, KTEXT, char *, char *, char *, 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]; char pop_error[ERROR_MAX];
int pop_debug = 0; int pop_debug = 0;
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
/* /*
* Function: pop_open (char *host, char *username, char *password, * Function: pop_open (char *host, char *username, char *password,
* int flags) * int flags)

6
lib/min-max.h Normal file
View 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