diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-21 15:22:34 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-21 15:22:34 -0800 |
| commit | ba01e9d785457898d873d6c8ec8bc1965fe4ff28 (patch) | |
| tree | 99a3172a81506b150c963135ce1d264034222265 | |
| parent | 08c690977a76a2a899bfe42056e9ae3a7efebcb3 (diff) | |
| download | emacs-ba01e9d785457898d873d6c8ec8bc1965fe4ff28.tar.gz | |
[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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 7 | ||||
| -rw-r--r-- | lib-src/pop.c | 6 | ||||
| -rw-r--r-- | lib/min-max.h | 6 |
5 files changed, 18 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index db173ddd9a1..ef876b6e831 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. 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) diff --git a/lib/min-max.h b/lib/min-max.h new file mode 100644 index 00000000000..997cdd191eb --- /dev/null +++ b/lib/min-max.h @@ -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 |