summaryrefslogtreecommitdiff
path: root/source4/ntvfs/ntvfs.h
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-03 10:40:33 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-03 07:37:07 +0200
commitcdd802af8319e0b0744d8e727cef75526269ece2 (patch)
treedeb3c73bc35357a7fe272d40ce1568274316f8cf /source4/ntvfs/ntvfs.h
parent7261a9b9f76d19e6a2179a48e903e2fee4ee64a1 (diff)
downloadsamba-cdd802af8319e0b0744d8e727cef75526269ece2.tar.gz
s4-messaging Rename messaging -> imessaging
This avoid symbol and structure conflicts between Samba3 and Samba4, and chooses a less generic name. Andrew Bartlett
Diffstat (limited to 'source4/ntvfs/ntvfs.h')
-rw-r--r--source4/ntvfs/ntvfs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index 203b588e087..a31e302dfcf 100644
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -201,7 +201,7 @@ struct ntvfs_context {
struct server_id server_id;
struct loadparm_context *lp_ctx;
struct tevent_context *event_ctx;
- struct messaging_context *msg_ctx;
+ struct imessaging_context *msg_ctx;
struct {
void *private_data;
@@ -330,7 +330,7 @@ struct ntvfs_critical_sizes {
.sizeof_ntvfs_handle_data = sizeof(struct ntvfs_handle_data), \
}
-struct messaging_context;
+struct imessaging_context;
#include "librpc/gen_ndr/security.h"
#include "librpc/gen_ndr/s4_notify.h"
#include "ntvfs/ntvfs_proto.h"