summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-24 11:21:29 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-05-24 23:08:57 +1000
commit9573c35636806a0ce013c32e611603c0e8a480fd (patch)
treec0795890b1135ec3fa80992d0b112471131563c6
parente7fe4d388516e7bf496056ae9828a4219d5ff7db (diff)
downloadsamba-9573c35636806a0ce013c32e611603c0e8a480fd.tar.gz
samba-9573c35636806a0ce013c32e611603c0e8a480fd.tar.bz2
samba-9573c35636806a0ce013c32e611603c0e8a480fd.zip
s4:winbind Change include guard so as not to conflict with idmap.h in source3
-rw-r--r--source4/winbind/idmap.c2
-rw-r--r--source4/winbind/idmap.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c
index b024777cf0..1b2d358b8b 100644
--- a/source4/winbind/idmap.c
+++ b/source4/winbind/idmap.c
@@ -152,7 +152,7 @@ static struct dom_sid *idmap_msg_get_dom_sid(TALLOC_CTX *mem_ctx,
*/
struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev_ctx,
- struct loadparm_context *lp_ctx)
+ struct loadparm_context *lp_ctx)
{
struct idmap_context *idmap_ctx;
diff --git a/source4/winbind/idmap.h b/source4/winbind/idmap.h
index 4a4bd4aceb..bf048e9758 100644
--- a/source4/winbind/idmap.h
+++ b/source4/winbind/idmap.h
@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _IDMAP_H_
-#define _IDMAP_H_
+#ifndef _WINBIND_IDMAP_H_
+#define _WINBIND_IDMAP_H_
#include "librpc/gen_ndr/idmap.h"