diff options
| author | Volker Lendecke <vl@samba.org> | 2009-01-19 11:39:24 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-01-19 11:40:43 +0100 |
| commit | b0c92548d8a0ec628e61364da04ea239cf297fc7 (patch) | |
| tree | 9aac27f311cd7bf755aabb53fccab841b62ca904 | |
| parent | 4b26c7bbf4fe93f5ffb92d3f04012be290be25be (diff) | |
| download | samba-b0c92548d8a0ec628e61364da04ea239cf297fc7.tar.gz samba-b0c92548d8a0ec628e61364da04ea239cf297fc7.tar.xz samba-b0c92548d8a0ec628e61364da04ea239cf297fc7.zip | |
Attempt to fix the merged build
| -rw-r--r-- | libcli/nbt/libnbt.h | 2 | ||||
| -rw-r--r-- | libcli/nbt/nbtsocket.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h index 491abd7b8ac..a37a213b086 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 0d269faa0ef..dac61efc118 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; } |