--- sockobj.cc.orig	Sat May 15 13:13:54 1999
+++ sockobj.cc	Fri Dec 15 00:37:45 2006
@@ -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>
@@ -93,6 +94,8 @@
 extern int errno;
 #endif
 
+void cleanupserverdriver(SIGARGS);
+
 /****************************************
 *** common daemon global variables
 ****************************************/
@@ -645,7 +648,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 +1864,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");