1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
freebsd-ports/www/fhttpd/files/patch-ae
Chris D. Faulhaber ae5a14a7ce Fix invalid (and unnecessary) check for the FreeBSD version. Verified to
build on RELENG_3 and RELENG_4

Noticed by:	bento
2000-07-13 23:00:46 +00:00

29 lines
1.1 KiB
Plaintext

--- 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>
+#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
@@ -645,7 +646,7 @@
global_nconnections++;
if(xsocket->status==0){
hisaddresslength=128;
- h=accept(xsocket->gethandle(),(struct sockaddr*)s,&hisaddresslength);
+ h=accept(xsocket->gethandle(),(struct sockaddr*)s,(socklen_t*)&hisaddresslength);
if(h<0) return;
hisaddress=(struct sockaddr*)malloc(hisaddresslength);
if(hisaddress) memcpy(hisaddress,s,hisaddresslength); else{
@@ -1861,7 +1862,7 @@
if(fdarray[sockets[i]->handleindexforwheel].revents&POLLIN){
fdarray[sockets[i]->handleindexforwheel].revents&=~POLLIN;
hisaddresslength=128;
- h=accept(sockets[i]->gethandle(),(struct sockaddr*)s,&hisaddresslength);
+ h=accept(sockets[i]->gethandle(),(struct sockaddr*)s,(socklen_t*)&hisaddresslength);
if(h>=0){
#ifdef DEBUG
log("Wheel::onepass: accepting connection");