From: Volker Lendecke <vl@samba.org>
Date: Mon, 19 Jan 2009 10:39:24 +0000 (+0100)
Subject: Attempt to fix the merged build
X-Git-Tag: samba-4.0.0alpha6~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0c92548d8a0ec628e61364da04ea239cf297fc7;p=thirdparty%2Fsamba.git

Attempt to fix the merged build
---

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;
 }