Attempt to fix the merged build

diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 491abd7b8ac98ce3d3774f461f0b36f00887d1f2..a37a213b08666af4db83820cfa97125a284cbe75 100644 (file)
--- 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 0d269faa0efceb3582030e5ebecef5c5fb0af229..dac61efc118bfb0b1825e71feef869e90f59c47f 100644 (file)
--- 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;
 }