summaryrefslogtreecommitdiff
path: root/source4/lib/messaging/messaging.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-01 00:03:47 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-01 00:17:20 +0100
commit5f13710ced2565355c3cdcef04067cacdf74a9ad (patch)
tree577f87ed1495048eba1f5321f94e11581a42aa5c /source4/lib/messaging/messaging.c
parent96f176dbd84090fd18b8c796f869ddaa2da39e59 (diff)
downloadsamba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.gz
samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.bz2
samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.zip
s4:irpc: avoid c++ reserved word 'private'
metze
Diffstat (limited to 'source4/lib/messaging/messaging.c')
-rw-r--r--source4/lib/messaging/messaging.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c27f977cce..cfceeffac7 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -109,7 +109,7 @@ static void ping_message(struct messaging_context *msg, void *private_data,
static NTSTATUS irpc_uptime(struct irpc_message *msg,
struct irpc_uptime *r)
{
- struct messaging_context *ctx = talloc_get_type(msg->private, struct messaging_context);
+ struct messaging_context *ctx = talloc_get_type(msg->private_data, struct messaging_context);
*r->out.start_time = timeval_to_nttime(&ctx->start_time);
return NT_STATUS_OK;
}
@@ -768,7 +768,7 @@ static void irpc_handler_request(struct messaging_context *msg_ctx,
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) goto failed;
/* make the call */
- m->private = i->private_data;
+ m->private_data= i->private_data;
m->defer_reply = false;
m->msg_ctx = msg_ctx;
m->irpc = i;