Minor tweaks.

svn path=/trunk/; revision=1496

4 files changed, 13 insertions, 3 deletions

diff --git a/driver.c b/driver.c
index 3ec6e522..b16848a4 100644
--- a/driver.c
+++ b/driver.c
@@ -72,7 +72,9 @@
 
 #define	SMTP_PORT	25	/* standard SMTP service port */
 
+#ifndef strstr		/* glibc-2.1 declares this as a macro */
 extern char *strstr();	/* needed on sysV68 R3V7.1. */
+#endif /* strstr */
 
 int fetchlimit;		/* how often to tear down the server connection */
 int batchcount;		/* count of messages sent in current batch */
diff --git a/fetchmail.man b/fetchmail.man
index f044017c..bcd349e2 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -1,4 +1,8 @@
 '\" t
+.\" ** The above line should force tbl to be used as a preprocessor **
+.\"
+.\" Man page for fetchmail
+.\"
 .\" For license terms, see the file COPYING in this directory.
 .TH fetchmail 1
 .SH NAME
@@ -172,9 +176,9 @@ machine in the server's queue of undelivered mail.
 .B \-U, --uidl
 (Keyword: uidl)
 Force UIDL use (effective only with POP3).  Force client-side tracking
-of `newness' of messages.  Use with `keep' to use a mailbox as a baby
-news drop for a group of users; if the mailbox is periodically purged,
-every member will get a chance to read the message.
+of `newness' of messages (UIDL stands for ``unique ID listing'' and is
+described in RFC1725).  Use with `keep' to use a mailbox as a baby
+news drop for a group of users.
 .TP
 .B \-P, --port
 (Keyword: port)
diff --git a/imap.c b/imap.c
index 317a3394..315f5407 100644
--- a/imap.c
+++ b/imap.c
@@ -26,7 +26,9 @@
 #include <krb.h>
 #endif /* KERBEROS_V4 */
 
+#ifndef strstr		/* glibc-2.1 declares this as a macro */
 extern char *strstr();	/* needed on sysV68 R3V7.1. */
+#endif /* strstr */
 
 /* imap_version values */
 #define IMAP2		-1	/* IMAP2 or IMAP2BIS, RFC1176 */
diff --git a/pop3.c b/pop3.c
index d3b95742..24c63147 100644
--- a/pop3.c
+++ b/pop3.c
@@ -23,7 +23,9 @@
 #include  <opie.h>
 #endif /* HAVE_LIBOPIE */
 
+#ifndef strstr		/* glibc-2.1 declares this as a macro */
 extern char *strstr();	/* needed on sysV68 R3V7.1. */
+#endif /* strstr */
 
 static int last;