X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fdebug.h;h=dde6af5e50f4dfb0df6047ec7fe3fa8422d5868d;hb=6e4c616ee215d5ed351b770d8fc31eb99e9911c0;hp=a75b4d2d9f9b22f027bc53fd531683469ba534be;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index a75b4d2d..dde6af5e 100644
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -40,8 +40,8 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-#ifndef DEVLIB_DEBUG_H
-#define DEVLIB_DEBUG_H
+#ifndef BERTOS_DEBUG_H
+#define BERTOS_DEBUG_H
 
 #include <cfg/os.h>
 #include <cfg/compiler.h>
@@ -72,7 +72,6 @@
 #endif
 
 #ifdef _DEBUG
-
 	// STLport specific: enable extra checks
 	#define __STL_DEBUG 1
 
@@ -119,8 +118,8 @@
 	 */
 	#define DB(x) x
 
-	#include <appconfig.h>  /* CONFIG_KDEBUG_ASSERT_NO_TEXT */
-	#include <cpu/attr.h>  /* CPU_HARVARD */
+	#include "cfg/cfg_debug.h"   /* CONFIG_KDEBUG_ASSERT_NO_TEXT */
+	#include <cpu/attr.h>        /* CPU_HARVARD */
 
 	/* These are implemented in drv/kdebug.c */
 	void kdbg_init(void);
@@ -187,6 +186,7 @@
 		#define TRACEMSG(...)  do {} while(0)
 	#endif
 
+
 	/**
 	 * \name Walls to detect data corruption
 	 * \{
@@ -305,9 +305,9 @@
 		#define kprintf(fmt,...) do { (void)(fmt); } while(0)
 	#else
 		/* ...but GCC can. */
-	    INLINE void kprintf(UNUSED_ARG(const char *, fmt), ...) { /* nop */ }
+		INLINE void kprintf(UNUSED_ARG(const char *, fmt), ...) { /* nop */ }
 	#endif
 
 #endif /* _DEBUG */
 
-#endif /* DEVLIB_DEBUG_H */
+#endif /* BERTOS_DEBUG_H */