X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsetsockopt.c;h=24a8d6e5bf136c03073a616e6f0ed25e7e5bf8c2;hb=d66478297fa398b1358bbd8b56b1b34e7fef5415;hp=64f4a814ede78a343e36a69631194a1365250012;hpb=a8ccc7e88310f9187a1655a9969da3ae007e2aa3;p=gnulib.git

diff --git a/lib/setsockopt.c b/lib/setsockopt.c
index 64f4a814e..24a8d6e5b 100644
--- a/lib/setsockopt.c
+++ b/lib/setsockopt.c
@@ -1,6 +1,6 @@
 /* setsockopt.c --- wrappers for Windows setsockopt function
 
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 #undef setsockopt
 
 int
-rpl_setsockopt (int fd, int level, int optname, const void *optval, int optlen)
+rpl_setsockopt (int fd, int level, int optname, const void *optval, socklen_t optlen)
 {
   int r;
   SOCKET sock = FD_TO_SOCKET (fd);
@@ -41,7 +41,8 @@ rpl_setsockopt (int fd, int level, int optname, const void *optval, int optlen)
     {
       const struct timeval *tv = optval;
       int milliseconds = tv->tv_sec * 1000 + tv->tv_usec / 1000;
-      r = setsockopt (sock, level, optname, &milliseconds, sizeof (int));
+      optval = &milliseconds;
+      r = setsockopt (sock, level, optname, optval, sizeof (int));
     }
   else
     {