Revert "s4:debug: make setup_logging() a bit more compatible with samba3"

[ira/wip.git] / lib / util / debug.h

diff --git a/lib/util/debug.h b/lib/util/debug.h
index 8c634f910a90c58a13ec8c9939752c8aab83e956..7518a64e19613ae8fa809781dbcea20fa788f508 100644 (file)
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -17,6 +17,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _SAMBA_DEBUG_H_
+#define _SAMBA_DEBUG_H_
+
 /**
  * @file
  * @brief Debugging macros
@@ -80,7 +83,7 @@ enum debug_logtype {DEBUG_STDOUT = 0, DEBUG_FILE = 1, DEBUG_STDERR = 2};
 */
 _PUBLIC_ void dbghdr(int level, const char *location, const char *func);
 
-_PUBLIC_ void dbghdrclass(int level, int class, const char *location, const char *func);
+_PUBLIC_ void dbghdrclass(int level, int cls, const char *location, const char *func);
 
 /**
   reopen the log file (usually called because the log file name might have changed)
@@ -130,4 +133,7 @@ _PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops);
 */
 _PUBLIC_ void dbgtext(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
 
-extern XFILE *dbf;
+struct _XFILE;
+extern struct _XFILE *dbf;
+
+#endif