summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-01-19 11:39:24 +0100
committerVolker Lendecke <vl@samba.org>2009-01-19 11:40:43 +0100
commitb0c92548d8a0ec628e61364da04ea239cf297fc7 (patch)
tree9aac27f311cd7bf755aabb53fccab841b62ca904
parent4b26c7bbf4fe93f5ffb92d3f04012be290be25be (diff)
downloadsamba-b0c92548d8a0ec628e61364da04ea239cf297fc7.tar.gz
samba-b0c92548d8a0ec628e61364da04ea239cf297fc7.tar.bz2
samba-b0c92548d8a0ec628e61364da04ea239cf297fc7.zip
Attempt to fix the merged build
-rw-r--r--libcli/nbt/libnbt.h2
-rw-r--r--libcli/nbt/nbtsocket.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 491abd7b8a..a37a213b08 100644
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -330,7 +330,7 @@ NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
NTSTATUS nbt_set_unexpected_handler(struct nbt_name_socket *nbtsock,
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *),
- void *private);
+ void *private_data);
NTSTATUS nbt_name_reply_send(struct nbt_name_socket *nbtsock,
struct socket_address *dest,
struct nbt_name_packet *request);
diff --git a/libcli/nbt/nbtsocket.c b/libcli/nbt/nbtsocket.c
index 0d269faa0e..dac61efc11 100644
--- a/libcli/nbt/nbtsocket.c
+++ b/libcli/nbt/nbtsocket.c
@@ -522,10 +522,10 @@ _PUBLIC_ NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
NTSTATUS nbt_set_unexpected_handler(struct nbt_name_socket *nbtsock,
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *),
- void *private)
+ void *private_data)
{
nbtsock->unexpected.handler = handler;
- nbtsock->unexpected.private_data = private;
+ nbtsock->unexpected.private_data = private_data;
EVENT_FD_READABLE(nbtsock->fde);
return NT_STATUS_OK;
}