X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetsockopt.c;h=4e53a6fe999656bc2541c14b2f2447f7df975945;hb=7c59efd8bc7abb8c79ae969a65ece95e68c9be4c;hp=3da37a99cda1521ecc92f089ed36be84badae315;hpb=a8ccc7e88310f9187a1655a9969da3ae007e2aa3;p=gnulib.git diff --git a/lib/getsockopt.c b/lib/getsockopt.c index 3da37a99c..4e53a6fe9 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-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 @@ -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); @@ -51,7 +51,7 @@ rpl_getsockopt (int fd, int level, int optname, void *optval, int *optlen) 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; }