summaryrefslogtreecommitdiff
path: root/libguile/socket.c
diff options
context:
space:
mode:
authorKevin Ryde <user42@zip.com.au>2005-07-10 01:56:07 +0000
committerKevin Ryde <user42@zip.com.au>2005-07-10 01:56:07 +0000
commit5ee417fc838a5e7bc1ded76990a82d650fdc8269 (patch)
tree5f4e7a8c8e3975f03bd75d858bdf8ca51bc39f02 /libguile/socket.c
parente363047c38f85e2b5a6bfb1aa4b968d8b6739fb5 (diff)
downloadguile-5ee417fc838a5e7bc1ded76990a82d650fdc8269.tar.gz
(scm_inet_pton, scm_inet_ntop): Pointer cast to scm_t_uint8
for scm ipv6 funcs, gcc 4 is picky about char* vs uchar*. (scm_getsockopt, scm_accept, scm_getsockname, scm_getpeername, scm_recvfrom) Use socklen_t, gcc 4 is picky about int* vs socklen_t*.
Diffstat (limited to 'libguile/socket.c')
-rw-r--r--libguile/socket.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libguile/socket.c b/libguile/socket.c
index c268d5e4e..28833df8f 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -365,7 +365,7 @@ SCM_DEFINE (scm_inet_pton, "inet-pton", 2, 0, 0,
if (af == AF_INET)
return scm_from_ulong (ntohl (*(scm_t_uint32 *) dst));
else
- return scm_from_ipv6 ((char *) dst);
+ return scm_from_ipv6 ((scm_t_uint8 *) dst);
}
#undef FUNC_NAME
#endif
@@ -397,7 +397,7 @@ SCM_DEFINE (scm_inet_ntop, "inet-ntop", 2, 0, 0,
if (af == AF_INET)
*(scm_t_uint32 *) addr6 = htonl (SCM_NUM2ULONG (2, address));
else
- scm_to_ipv6 (addr6, address);
+ scm_to_ipv6 ((scm_t_uint8 *) addr6, address);
if (inet_ntop (af, &addr6, dst, sizeof dst) == NULL)
SCM_SYSERROR;
return scm_from_locale_string (dst);
@@ -476,10 +476,10 @@ SCM_DEFINE (scm_getsockopt, "getsockopt", 3, 0, 0,
/* size of optval is the largest supported option. */
#ifdef HAVE_STRUCT_LINGER
char optval[sizeof (struct linger)];
- int optlen = sizeof (struct linger);
+ socklen_t optlen = sizeof (struct linger);
#else
char optval[sizeof (size_t)];
- int optlen = sizeof (size_t);
+ socklen_t optlen = sizeof (size_t);
#endif
int ilevel;
int ioptname;
@@ -998,7 +998,7 @@ SCM_DEFINE (scm_accept, "accept", 1, 0, 0,
int newfd;
SCM address;
SCM newsock;
- int addr_size = MAX_ADDR_SIZE;
+ socklen_t addr_size = MAX_ADDR_SIZE;
char max_addr[MAX_ADDR_SIZE];
struct sockaddr *addr = (struct sockaddr *) max_addr;
@@ -1022,7 +1022,7 @@ SCM_DEFINE (scm_getsockname, "getsockname", 1, 0, 0,
#define FUNC_NAME s_scm_getsockname
{
int fd;
- int addr_size = MAX_ADDR_SIZE;
+ socklen_t addr_size = MAX_ADDR_SIZE;
char max_addr[MAX_ADDR_SIZE];
struct sockaddr *addr = (struct sockaddr *) max_addr;
@@ -1044,7 +1044,7 @@ SCM_DEFINE (scm_getpeername, "getpeername", 1, 0, 0,
#define FUNC_NAME s_scm_getpeername
{
int fd;
- int addr_size = MAX_ADDR_SIZE;
+ socklen_t addr_size = MAX_ADDR_SIZE;
char max_addr[MAX_ADDR_SIZE];
struct sockaddr *addr = (struct sockaddr *) max_addr;
@@ -1179,7 +1179,7 @@ SCM_DEFINE (scm_recvfrom, "recvfrom!", 2, 3, 0,
size_t offset;
size_t cend;
SCM address;
- int addr_size = MAX_ADDR_SIZE;
+ socklen_t addr_size = MAX_ADDR_SIZE;
char max_addr[MAX_ADDR_SIZE];
struct sockaddr *addr = (struct sockaddr *) max_addr;