[SCM] Samba Shared Repository - branch master updated - b0c92548d8a0ec628e61364da04ea239cf297fc7

[Volker Lendecke]

The branch, master has been updated
       via  b0c92548d8a0ec628e61364da04ea239cf297fc7 (commit)
      from  4b26c7bbf4fe93f5ffb92d3f04012be290be25be (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b0c92548d8a0ec628e61364da04ea239cf297fc7
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jan 19 11:39:24 2009 +0100

    Attempt to fix the merged build

-----------------------------------------------------------------------

Summary of changes:
 libcli/nbt/libnbt.h    |    2 +-
 libcli/nbt/nbtsocket.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 491abd7..a37a213 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 0d269fa..dac61ef 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;
 }


-- 
Samba Shared Repository