summaryrefslogtreecommitdiff
path: root/source4/lib/messaging
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-18 10:10:30 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-18 18:41:00 +1100
commitbed374215ff040cc995659d42938be35412a794a (patch)
tree3d65c515ff6144564eb76b1ce5059f65e2cd7a79 /source4/lib/messaging
parentcfeceedfab64fe8b7f5823d1ada3f6d9b1799adf (diff)
downloadsamba-bed374215ff040cc995659d42938be35412a794a.tar.gz
samba-bed374215ff040cc995659d42938be35412a794a.tar.bz2
samba-bed374215ff040cc995659d42938be35412a794a.zip
s4-idl: rename s4 server_id.idl to server_id4.idl
this avoids a conflict with the new s3 server_id.idl Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/lib/messaging')
-rw-r--r--source4/lib/messaging/messaging.h2
-rw-r--r--source4/lib/messaging/pymessaging.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h
index 75990e3705..4bc6d8c509 100644
--- a/source4/lib/messaging/messaging.h
+++ b/source4/lib/messaging/messaging.h
@@ -21,7 +21,7 @@
#ifndef _MESSAGES_H_
#define _MESSAGES_H_
-#include "librpc/gen_ndr/server_id.h"
+#include "librpc/gen_ndr/server_id4.h"
struct messaging_context;
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index aece5efd09..358d205b53 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -31,7 +31,7 @@
#include "param/param.h"
#include "param/pyparam.h"
#include "librpc/rpc/dcerpc.h"
-#include "librpc/gen_ndr/server_id.h"
+#include "librpc/gen_ndr/server_id4.h"
void initmessaging(void);