diff --git a/src/fdlib.c b/src/fdlib.c
index 3be873b28c75f007e8931dd47fe1334e74b71c46..9450adc9f8a2f65755d037370ed3fbe468cacac1 100644
--- a/src/fdlib.c
+++ b/src/fdlib.c
@@ -3,7 +3,7 @@
 #include "error.h"
 #include <math.h>
 
-RCSID("$Id: fdlib.c,v 1.35 2000/07/02 15:00:12 grubba Exp $");
+RCSID("$Id: fdlib.c,v 1.36 2000/07/02 16:04:07 grubba Exp $");
 
 #ifdef HAVE_WINSOCK_H
 
@@ -365,12 +365,12 @@ int PIKE_CONCAT(debug_fd_,NAME) X1 { SOCKET ret; \
 
 
 SOCKFUN2(bind, struct sockaddr *, int)
-SOCKFUN4(getsockopt,int,int,void*,int*)
+SOCKFUN4(getsockopt,int,int,void*,ACCEPT_SIZE_T *)
 SOCKFUN4(setsockopt,int,int,void*,int)
 SOCKFUN3(recv,void *,int,int)
-SOCKFUN2(getsockname,struct sockaddr *,int *)
-SOCKFUN2(getpeername,struct sockaddr *,int *)
-SOCKFUN5(recvfrom,void *,int,int,struct sockaddr *,int*)
+SOCKFUN2(getsockname,struct sockaddr *,ACCEPT_SIZE_T *)
+SOCKFUN2(getpeername,struct sockaddr *,ACCEPT_SIZE_T *)
+SOCKFUN5(recvfrom,void *,int,int,struct sockaddr *,ACCEPT_SIZE_T *)
 SOCKFUN3(send,void *,int,int)
 SOCKFUN5(sendto,void *,int,int,struct sockaddr *,unsigned int)
 SOCKFUN1(shutdown, int)
diff --git a/src/fdlib.h b/src/fdlib.h
index 2f37eab651058265764570a6d9d62655315507ed..82784462019492a1ec38030c225329389ed82a12 100644
--- a/src/fdlib.h
+++ b/src/fdlib.h
@@ -1,5 +1,5 @@
 /*
- * $Id: fdlib.h,v 1.31 2000/07/02 14:59:39 grubba Exp $
+ * $Id: fdlib.h,v 1.32 2000/07/02 16:04:07 grubba Exp $
  */
 #ifndef FDLIB_H
 #define FDLIB_H
@@ -111,12 +111,12 @@ int debug_fd_pipe(int fds[2] DMALLOC_LINE_ARGS);
 FD debug_fd_accept(FD fd, struct sockaddr *addr, ACCEPT_SIZE_T *addrlen);
 SOCKFUN2(bind, struct sockaddr *, int)
 int debug_fd_connect (FD fd, struct sockaddr *a, int len);
-SOCKFUN4(getsockopt,int,int,void*,int*)
+SOCKFUN4(getsockopt,int,int,void*,ACCEPT_SIZE_T *)
 SOCKFUN4(setsockopt,int,int,void*,int)
 SOCKFUN3(recv,void *,int,int)
-SOCKFUN2(getsockname,struct sockaddr *,int *)
-SOCKFUN2(getpeername,struct sockaddr *,int *)
-SOCKFUN5(recvfrom,void *,int,int,struct sockaddr *,int*)
+SOCKFUN2(getsockname,struct sockaddr *,ACCEPT_SIZE_T *)
+SOCKFUN2(getpeername,struct sockaddr *,ACCEPT_SIZE_T *)
+SOCKFUN5(recvfrom,void *,int,int,struct sockaddr *,ACCEPT_SIZE_T *)
 SOCKFUN3(send,void *,int,int)
 SOCKFUN5(sendto,void *,int,int,struct sockaddr *,unsigned int)
 SOCKFUN1(shutdown, int)