diff options
| author | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2000-07-13 23:00:46 +0000 |
|---|---|---|
| committer | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2000-07-13 23:00:46 +0000 |
| commit | ae5a14a7cebec6b547cb933646e0a4aa48dbb283 (patch) | |
| tree | 570a244b700e7eb699c18502ef907f0afaaf40f9 /www/fhttpd | |
| parent | Update to version 3.2.1 (bugfixes). (diff) | |
Fix invalid (and unnecessary) check for the FreeBSD version. Verified to
build on RELENG_3 and RELENG_4
Noticed by: bento
Notes
Notes:
svn path=/head/; revision=30593
Diffstat (limited to 'www/fhttpd')
| -rw-r--r-- | www/fhttpd/files/patch-ae | 12 | ||||
| -rw-r--r-- | www/fhttpd/files/patch-ag | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/www/fhttpd/files/patch-ae b/www/fhttpd/files/patch-ae index 8f7bcf4418b0..638f7ecc7971 100644 --- a/www/fhttpd/files/patch-ae +++ b/www/fhttpd/files/patch-ae @@ -1,16 +1,14 @@ ---- sockobj.cc.orig Sat May 15 06:13:54 1999 -+++ sockobj.cc Sat May 27 14:57:47 2000 -@@ -53,6 +53,9 @@ +--- sockobj.cc.orig Sat May 15 07:13:54 1999 ++++ sockobj.cc Thu Jul 13 18:50:19 2000 +@@ -53,6 +53,7 @@ #include <stdarg.h> #include <errno.h> #include <time.h> -+#if defined(__FreeBSD__) && __FreeBSD__ >= 5 +#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */ -+#endif #include <sys/socket.h> #include <sys/un.h> #include <netinet/in.h> -@@ -645,7 +648,7 @@ +@@ -645,7 +646,7 @@ global_nconnections++; if(xsocket->status==0){ hisaddresslength=128; @@ -19,7 +17,7 @@ if(h<0) return; hisaddress=(struct sockaddr*)malloc(hisaddresslength); if(hisaddress) memcpy(hisaddress,s,hisaddresslength); else{ -@@ -1861,7 +1864,7 @@ +@@ -1861,7 +1862,7 @@ if(fdarray[sockets[i]->handleindexforwheel].revents&POLLIN){ fdarray[sockets[i]->handleindexforwheel].revents&=~POLLIN; hisaddresslength=128; diff --git a/www/fhttpd/files/patch-ag b/www/fhttpd/files/patch-ag index f08fc28d0184..64d4db8f0df0 100644 --- a/www/fhttpd/files/patch-ag +++ b/www/fhttpd/files/patch-ag @@ -1,12 +1,10 @@ ---- servproc.h.orig Sat May 27 15:00:37 2000 -+++ servproc.h Sat May 27 15:00:58 2000 -@@ -29,6 +29,9 @@ +--- servproc.h.orig Wed Apr 7 09:44:22 1999 ++++ servproc.h Thu Jul 13 18:53:55 2000 +@@ -29,6 +29,7 @@ #endif #include <sys/time.h> #include <sys/stat.h> -+#if defined(__FreeBSD__) && __FreeBSD__ >= 5 +#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */ -+#endif #include <sys/socket.h> #include <sys/un.h> #include <sys/file.h> |