X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fdebug.h;h=fc811ee5b089019fb193d3b6ba516d829e8ca3ab;hb=f7759618132fca8a34d8a02dc6d0acf0474e6ca1;hp=f040b37f831e9057181363c84cdf667f5396effe;hpb=b5eeff2dc85aa27a07db15a62041861b228b866a;p=bertos.git

diff --git a/cfg/debug.h b/cfg/debug.h
index f040b37f..fc811ee5 100755
--- a/cfg/debug.h
+++ b/cfg/debug.h
@@ -17,6 +17,21 @@
 
 /*#*
  *#* $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.
+ *#*
+ *#* Revision 1.9  2006/02/23 08:40:33  bernie
+ *#* TRACEMSG() support for compilers with no variadic macros.
+ *#*
  *#* Revision 1.8  2006/02/23 08:33:04  bernie
  *#* Fix for compilers without variadic macros support.
  *#*
@@ -69,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>
 
 
 /*
@@ -103,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
@@ -176,9 +172,23 @@
 		{
 			fputs(str, stderr);
 		}
-		/* G++ can't inline functions with variable arguments... */
-		#define kprintf(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
-		#define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap)
+		#if COMPILER_VARIADIC_MACROS
+			/* 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;
+				int result;
+
+				va_start(ap, fmt);
+				result = kvprintf(fmt, ap);
+				va_end(ap);
+
+				return result;
+			}
+		#endif
 		void kdump(const void *buf, size_t len); /* UNIMPLEMENTED */
 
 		#ifndef ASSERT
@@ -205,7 +215,18 @@
 
 		#if !CONFIG_KDEBUG_DISABLE_TRACE
 			#define TRACE  kprintf("%s()\n", __func__)
-			#define TRACEMSG(msg,...) kprintf("%s(): " msg, __func__, ## __VA_ARGS__)
+			#if COMPILER_VARIADIC_MACROS
+				#define TRACEMSG(msg,...) kprintf("%s(): " msg, __func__, ## __VA_ARGS__)
+			#else
+				INLINE void TRACEMSG(const char *fmt, ...)
+				{
+					va_list va;
+					va_start(va, fmt);
+					kprintf("%s(): ", __func__);
+					kvprintf(fmt, va);
+					va_end(va);
+				}
+			#endif
 		#else
 			#define TRACE  do {} while(0)
 			#define TRACEMSG(...)  do {} while(0)