From bed374215ff040cc995659d42938be35412a794a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Feb 2011 10:10:30 +1100 Subject: 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 --- source4/cluster/cluster.c | 2 +- source4/cluster/cluster.h | 2 +- source4/cluster/local.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/cluster') diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c index b3fc9c2caf..746c004820 100644 --- a/source4/cluster/cluster.c +++ b/source4/cluster/cluster.c @@ -23,7 +23,7 @@ #include "cluster/cluster.h" #include "cluster/cluster_private.h" #include "librpc/gen_ndr/misc.h" -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" static struct cluster_ops *ops; diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index 8de58a398f..6cfcb9b21b 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -22,7 +22,7 @@ #ifndef __CLUSTER_H__ #define __CLUSTER_H__ -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" /* test for same cluster id diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 96d1d53d4a..2d910d1e28 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -26,7 +26,7 @@ #include "tdb_wrap.h" #include "system/filesys.h" #include "param/param.h" -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" /* server a server_id for the local node -- cgit