1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

Fix invalid (and unnecessary) check for the FreeBSD version. Verified to

build on RELENG_3 and RELENG_4

Noticed by:	bento
This commit is contained in:
Chris D. Faulhaber 2000-07-13 23:00:46 +00:00
parent f0584d9d74
commit ae5a14a7ce
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30593
2 changed files with 8 additions and 12 deletions

View File

@ -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;

View File

@ -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>