summaryrefslogtreecommitdiff
path: root/lib/getsockopt.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-06-16 20:01:56 +0200
committerAndy Wingo <wingo@pobox.com>2011-06-16 20:01:56 +0200
commit99cc1092a89292c6e6db2db537988e5963b19868 (patch)
tree94f69d35c6328c2ab83304d8996a2dd957cac529 /lib/getsockopt.c
parent46da7909e1f67c13284730344e971d293df890c0 (diff)
parent32f94bf258bd032fa6f96fc76e4153086bc001f5 (diff)
downloadguile-99cc1092a89292c6e6db2db537988e5963b19868.tar.gz
Merge remote-tracking branch 'local-2.0/stable-2.0'
Diffstat (limited to 'lib/getsockopt.c')
-rw-r--r--lib/getsockopt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/getsockopt.c b/lib/getsockopt.c
index 7c83f01aa..8433ab921 100644
--- a/lib/getsockopt.c
+++ b/lib/getsockopt.c
@@ -46,7 +46,8 @@ rpl_getsockopt (int fd, int level, int optname, void *optval, socklen_t *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);