diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-12-03 04:02:05 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-12-03 04:02:05 +0000 |
| commit | 674c7a07da4e7f582ab8bef41586d0e55419fe8c (patch) | |
| tree | 97baade7473747648a1dc00d6a23ac16d7050a4b /news/nntp | |
| parent | 936c88c6aa392670a4b72be7d3513feec5970b61 (diff) | |
| download | ports-674c7a07da4e7f582ab8bef41586d0e55419fe8c.tar.gz ports-674c7a07da4e7f582ab8bef41586d0e55419fe8c.zip | |
Fix for bento on CURRENT (u_long problem)
Notes
Notes:
svn path=/head/; revision=71332
Diffstat (limited to 'news/nntp')
| -rw-r--r-- | news/nntp/files/patch-xmit-nntpxmit.c | 39 | ||||
| -rw-r--r-- | news/nntp/files/patch-xmit-shlock.c | 32 |
2 files changed, 59 insertions, 12 deletions
diff --git a/news/nntp/files/patch-xmit-nntpxmit.c b/news/nntp/files/patch-xmit-nntpxmit.c index e82ee92de220..710816315ccb 100644 --- a/news/nntp/files/patch-xmit-nntpxmit.c +++ b/news/nntp/files/patch-xmit-nntpxmit.c @@ -1,28 +1,40 @@ --- xmit/nntpxmit.c.orig Sat Dec 3 23:37:58 1994 -+++ xmit/nntpxmit.c Thu Nov 7 19:40:02 2002 -@@ -64,8 +64,12 @@ - */ - ++++ xmit/nntpxmit.c Tue Dec 3 05:02:55 2002 +@@ -66,6 +66,7 @@ #include "../conf.h" -+#ifdef BSD_44 -+#define _ANSI_SOURCE -+#endif #include <stdio.h> #include <errno.h> +#include <unistd.h> #include <ctype.h> #include <sys/types.h> #include <sys/time.h> -@@ -75,7 +79,9 @@ +@@ -75,7 +76,10 @@ #include <sys/times.h> extern time_t time(); #endif +#ifndef __FreeBSD__ #include <sys/file.h> ++#include <string.h> +#endif #include <fcntl.h> #include <signal.h> #ifdef USG +@@ -148,6 +152,7 @@ + + double Tbegin, Tend; /* transfer timestamps */ + ++#ifndef __FreeBSD__ + extern int errno; + extern int strncmp(); + extern char *rindex(); +@@ -155,6 +160,7 @@ + extern char *mktemp(); + extern char *strcpy(); + extern char *strcat(); ++#endif + + main(ac, av) + int ac; @@ -445,7 +451,7 @@ /* Hmph. The file didn't exist. */ error = sendcmd("."); @@ -32,3 +44,14 @@ /* Leave this open in case we need to requeue it. */ } if (error) { +@@ -515,8 +521,10 @@ + errmsg(code) + int code; + { ++#ifndef __FreeBSD__ + extern int sys_nerr; + extern char *sys_errlist[]; ++#endif + static char ebuf[6+5+1]; + + if (code > sys_nerr || code < 0) { diff --git a/news/nntp/files/patch-xmit-shlock.c b/news/nntp/files/patch-xmit-shlock.c index ab52bd715699..a4ac70e171e6 100644 --- a/news/nntp/files/patch-xmit-shlock.c +++ b/news/nntp/files/patch-xmit-shlock.c @@ -1,5 +1,5 @@ --- xmit/shlock.c.orig Tue Nov 1 06:54:32 1994 -+++ xmit/shlock.c Sun Jan 9 09:30:04 2000 ++++ xmit/shlock.c Tue Dec 3 05:04:26 2002 @@ -28,7 +28,6 @@ ** Erik E. Fair <fair@apple.com>, November 12, 1989 */ @@ -12,10 +12,34 @@ #ifdef NNTPSRC #include "../conf.h" #endif -+#ifdef BSD_44 -+#define _ANSI_SOURCE -+#endif +#include <stdio.h> ++#ifdef __FreeBSD__ ++#include <string.h> ++#endif #define LOCK_SET 0 #define LOCK_FAIL 1 +@@ -61,10 +64,12 @@ + + #define dprintf if (Debug) printf + ++#ifndef __FreeBSD__ + extern int errno; + extern char *rindex(); + extern char *strcpy(); + extern char *strcat(); ++#endif + + main(ac, av) + int ac; +@@ -118,8 +123,10 @@ + errmsg(n) + register int n; + { ++#ifndef __FreeBSD__ + extern int sys_nerr; + extern char *sys_errlist[]; ++#endif + + return((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error"); + } |