From cdd802af8319e0b0744d8e727cef75526269ece2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 3 May 2011 10:40:33 +1000 Subject: s4-messaging Rename messaging -> imessaging This avoid symbol and structure conflicts between Samba3 and Samba4, and chooses a less generic name. Andrew Bartlett --- source4/libcli/wbclient/wbclient.c | 2 +- source4/libcli/wbclient/wbclient.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/libcli/wbclient') diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c index 5c4312cc66..4f50c10694 100644 --- a/source4/libcli/wbclient/wbclient.c +++ b/source4/libcli/wbclient/wbclient.c @@ -31,7 +31,7 @@ * \param */ struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx, - struct messaging_context *msg_ctx, + struct imessaging_context *msg_ctx, struct tevent_context *event_ctx) { struct wbc_context *ctx; diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h index e7473e3e7b..1fa2f59c57 100644 --- a/source4/libcli/wbclient/wbclient.h +++ b/source4/libcli/wbclient/wbclient.h @@ -28,7 +28,7 @@ struct wbc_context { }; struct wbc_context *wbc_init(TALLOC_CTX *mem_ctx, - struct messaging_context *msg_ctx, + struct imessaging_context *msg_ctx, struct tevent_context *event_ctx); struct composite_context *wbc_sids_to_xids_send(struct wbc_context *wbc_ctx, -- cgit