summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-09-19 00:55:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:52:20 -0500
commit4d451bd2139d4ffbb274355e7f6f275be5b5d0eb (patch)
tree9d0164136a46fac60763c52d48670d3b2b810073 /source3
parentb4498846618eacde0d38e88c0f1882eff9f56b5c (diff)
downloadsamba-4d451bd2139d4ffbb274355e7f6f275be5b5d0eb.tar.gz
samba-4d451bd2139d4ffbb274355e7f6f275be5b5d0eb.tar.bz2
samba-4d451bd2139d4ffbb274355e7f6f275be5b5d0eb.zip
r18661: C++ warnings
(This used to be commit 6004b8025de3207f5af2d62087ec13c5e444fec7)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/socket_wrapper/socket_wrapper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/socket_wrapper/socket_wrapper.c b/source3/lib/socket_wrapper/socket_wrapper.c
index 5417f70a06..331e23aa48 100644
--- a/source3/lib/socket_wrapper/socket_wrapper.c
+++ b/source3/lib/socket_wrapper/socket_wrapper.c
@@ -473,7 +473,7 @@ _PUBLIC_ int swrap_socket(int family, int type, int protocol)
if (fd == -1) return -1;
- si = calloc(1, sizeof(struct socket_info));
+ si = (struct socket_info *)calloc(1, sizeof(struct socket_info));
si->family = family;
si->type = type;
@@ -518,7 +518,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
return ret;
}
- child_si = malloc(sizeof(struct socket_info));
+ child_si = (struct socket_info *)malloc(sizeof(struct socket_info));
memset(child_si, 0, sizeof(*child_si));
child_si->fd = fd;