From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Feb 2011 20:40:22 +0000 (+1100)
Subject: lib/util move debug.[ch] out of the way
X-Git-Tag: tevent-0.9.11~208
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=4acef317a0e1692afc526a3805adf87403651170;p=ambi%2Fsamba-autobuild%2F.git

lib/util move debug.[ch] out of the way

This will allow a modified version of the s3 debug system to be the
new common debug system.

Andrew Bartlett
---

diff --git a/lib/util/debug.c b/lib/util/debug_s4.c
similarity index 100%
rename from lib/util/debug.c
rename to lib/util/debug_s4.c
diff --git a/lib/util/debug.h b/lib/util/debug_s4.h
similarity index 100%
rename from lib/util/debug.h
rename to lib/util/debug_s4.h
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index e472ff73b55..cc53dd3f75a 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -18,7 +18,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
 
 if bld.env._SAMBA_BUILD_ == 4:
     bld.SAMBA_LIBRARY('samba-util',
-                      source='''debug.c dprintf.c fault.c
+                      source='''debug_s4.c dprintf.c fault.c
                       ms_fnmatch.c parmlist.c substitute.c util_str.c
                       ''',
                       deps='samba-util-common',
diff --git a/source4/include/includes.h b/source4/include/includes.h
index d0a97020c6e..a4ef19a0429 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -57,7 +57,7 @@
 #endif
 #include "../lib/util/xfile.h"
 #include "../lib/util/attr.h"
-#include "../lib/util/debug.h"
+#include "../lib/util/debug_s4.h"
 #include "../lib/util/util.h"
 
 #include "libcli/util/error.h"