X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetsockopt.c;h=d82ea5ff218aed463409c2b0bc6f785e018aceba;hb=24bfc89ccc3fd4ce86652dbbb95afd844db59a07;hp=3da37a99cda1521ecc92f089ed36be84badae315;hpb=a8ccc7e88310f9187a1655a9969da3ae007e2aa3;p=gnulib.git

diff --git a/lib/getsockopt.c b/lib/getsockopt.c
index 3da37a99c..d82ea5ff2 100644
--- a/lib/getsockopt.c
+++ b/lib/getsockopt.c
@@ -1,6 +1,6 @@
 /* getsockopt.c --- wrappers for Windows getsockopt function
 
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011 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
@@ -35,7 +35,7 @@
 #undef getsockopt
 
 int
-rpl_getsockopt (int fd, int level, int optname, void *optval, int *optlen)
+rpl_getsockopt (int fd, int level, int optname, void *optval, socklen_t *optlen)
 {
   int r;
   SOCKET sock = FD_TO_SOCKET (fd);
@@ -46,12 +46,13 @@ rpl_getsockopt (int fd, int level, int optname, void *optval, int *optlen)
       int milliseconds_len = sizeof (int);
       struct timeval tv;
       size_t n;
-      r = getsockopt (sock, level, optname, &milliseconds, &milliseconds_len);
+      r = getsockopt (sock, level, optname, (char *) &milliseconds,
+                      &milliseconds_len);
       tv.tv_sec = milliseconds / 1000;
       tv.tv_usec = (milliseconds - 1000 * tv.tv_sec) * 1000;
       n = sizeof (struct timeval);
       if (n > *optlen)
-	  n = *optlen;
+        n = *optlen;
       memcpy (optval, &tv, n);
       *optlen = n;
     }