summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-05-05 03:03:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:26 -0500
commitf9eda19d80f40b39ffbd48119928651512a11d49 (patch)
treecc8b8625faa2e8cb7468dacbaaf864c78505df76
parentc2c069d4b0fc6e29194a8ba8d12b8aba59dae4c2 (diff)
downloadsamba-f9eda19d80f40b39ffbd48119928651512a11d49.tar.gz
samba-f9eda19d80f40b39ffbd48119928651512a11d49.tar.bz2
samba-f9eda19d80f40b39ffbd48119928651512a11d49.zip
r487: fixing some compile issues with the IBM AIX compiler reoported on the ml -- now to watch the build farm some more
(This used to be commit 79fed5f5a73cfe4811f626acbcf85860e23e7826)
-rw-r--r--source3/lib/util_sock.c12
-rw-r--r--source3/lib/util_uuid.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 3984f5e8ac..b6bfdca5cf 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -33,7 +33,7 @@ static char *get_socket_addr(int fd)
{
struct sockaddr sa;
struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
- int length = sizeof(sa);
+ socklen_t length = sizeof(sa);
static fstring addr_buf;
fstrcpy(addr_buf,"0.0.0.0");
@@ -58,7 +58,8 @@ static char *get_socket_addr(int fd)
BOOL is_a_socket(int fd)
{
- int v,l;
+ int v;
+ socklen_t l;
l = sizeof(int);
return(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&v, &l) == 0);
}
@@ -115,7 +116,8 @@ static const smb_socket_option socket_options[] = {
static void print_socket_options(int s)
{
- int value, vlen = 4;
+ int value;
+ socklen_t vlen = 4;
const smb_socket_option *p = &socket_options[0];
/* wrapped in if statement to prevent streams leak in SCO Openserver 5.0 */
@@ -838,7 +840,7 @@ char *client_socket_addr(void)
struct in_addr *client_inaddr(struct sockaddr *sa)
{
struct sockaddr_in *sockin = (struct sockaddr_in *) (sa);
- int length = sizeof(*sa);
+ socklen_t length = sizeof(*sa);
if (getpeername(client_fd, sa, &length) < 0) {
DEBUG(0,("getpeername failed. Error was %s\n", strerror(errno) ));
@@ -963,7 +965,7 @@ char *get_peer_addr(int fd)
{
struct sockaddr sa;
struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
- int length = sizeof(sa);
+ socklen_t length = sizeof(sa);
static fstring addr_buf;
fstrcpy(addr_buf,"0.0.0.0");
diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index 4c35236c90..dc9bc92023 100644
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -45,7 +45,7 @@ void smb_uuid_unpack(const UUID_FLAT in, struct uuid *uu)
memcpy(uu->node, in.info+10, 6);
}
-const struct uuid smb_uuid_unpack_static(const UUID_FLAT in)
+struct uuid smb_uuid_unpack_static(const UUID_FLAT in)
{
static struct uuid uu;