aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/pop.c
diff options
context:
space:
mode:
authorPaul Eggert2011-02-21 15:22:34 -0800
committerPaul Eggert2011-02-21 15:22:34 -0800
commitba01e9d785457898d873d6c8ec8bc1965fe4ff28 (patch)
tree99a3172a81506b150c963135ce1d264034222265 /lib-src/pop.c
parent08c690977a76a2a899bfe42056e9ae3a7efebcb3 (diff)
downloademacs-ba01e9d785457898d873d6c8ec8bc1965fe4ff28.tar.gz
emacs-ba01e9d785457898d873d6c8ec8bc1965fe4ff28.zip
[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.
Diffstat (limited to 'lib-src/pop.c')
-rw-r--r--lib-src/pop.c6
1 files changed, 2 insertions, 4 deletions
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 * */);
90# endif 90# endif
91#endif /* KERBEROS */ 91#endif /* KERBEROS */
92 92
93#include <min-max.h>
94
93#ifdef KERBEROS 95#ifdef KERBEROS
94#ifndef KERBEROS5 96#ifndef KERBEROS5
95extern int krb_sendauth (/* long, int, KTEXT, char *, char *, char *, 97extern int krb_sendauth (/* long, int, KTEXT, char *, char *, char *,
@@ -130,10 +132,6 @@ static char *find_crlf (char *, int);
130char pop_error[ERROR_MAX]; 132char pop_error[ERROR_MAX];
131int pop_debug = 0; 133int pop_debug = 0;
132 134
133#ifndef min
134#define min(a,b) (((a) < (b)) ? (a) : (b))
135#endif
136
137/* 135/*
138 * Function: pop_open (char *host, char *username, char *password, 136 * Function: pop_open (char *host, char *username, char *password,
139 * int flags) 137 * int flags)