Search for verstag.h in app subdirs first.

[bertos.git] / cfg / debug.h

diff --git a/cfg/debug.h b/cfg/debug.h
index 979130888e017a5bc90de733191d89659dc1d994..fc811ee5b089019fb193d3b6ba516d829e8ca3ab 100755 (executable)
--- a/cfg/debug.h
+++ b/cfg/debug.h
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.13  2006/03/22 13:34:34  bernie
+ *#* MSVC support.
+ *#*
+ *#* Revision 1.12  2006/03/22 09:48:23  bernie
+ *#* Simplify.
+ *#*
+ *#* Revision 1.11  2006/02/23 11:17:16  bernie
+ *#* Documentation fixes.
+ *#*
  *#* Revision 1.10  2006/02/23 09:10:10  bernie
  *#* Add even more code duplication until we properly refactor debug.h.
  *#*
@@ -75,27 +84,7 @@
 #define DEVLIB_DEBUG_H
 
 #include <cfg/os.h>
-
-#if OS_HOSTED
-       /*
-        * For now, avoid dependency on compiler.h
-        */
-       #ifndef FORMAT
-       #define FORMAT(x,y,z) /* nothing */
-       #endif
-       #ifndef INLINE
-       #define INLINE static inline
-       #endif
-       #ifndef UNUSED_ARG
-       #ifdef __cplusplus
-               #define UNUSED_ARG(type,name) type
-       #else
-               #define UNUSED_ARG(type,name) type name
-       #endif
-       #endif
-#else /* !OS_HOSTED */
-       #include <cfg/compiler.h>
-#endif /* !OS_HOSTED */
+#include <cfg/compiler.h>
 
 
 /*
@@ -109,18 +98,19 @@
 #define CONFIG_KDEBUG_ASSERT_NO_TEXT  0
 #endif
 
+#if defined(__doxygen__)
+       /**
+        * Preprocessor symbol defined only for debug builds.
+        *
+        * The build infrastructure must arrange for _DEBUG to
+        * be predefined for all the source files being compiled.
+        *
+        * This is compatible with the MSVC convention for the
+        * default Debug and Release project targets.
+        */
+       #define _DEBUG 1
+#endif
 
-/*!
- * \def _DEBUG
- *
- * This preprocessor symbol is defined only in debug builds.
- *
- * The build infrastructure must arrange for _DEBUG to
- * be predefined for all source files being compiled.
- *
- * This is compatible with the Microsoft convention for
- * the default Debug and Release targets.
- */
 #ifdef _DEBUG
 
        // STLport specific: enable extra checks
@@ -186,6 +176,7 @@
                        /* G++ can't inline functions with variable arguments... */
                        #define kprintf(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
                #else
+                       #define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap)
                        INLINE int kprintf(const char *fmt, ...)
                        {
                                va_list ap;
@@ -198,7 +189,6 @@
                                return result;
                        }
                #endif
-               #define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap)
                void kdump(const void *buf, size_t len); /* UNIMPLEMENTED */
 
                #ifndef ASSERT