From b5eeff2dc85aa27a07db15a62041861b228b866a Mon Sep 17 00:00:00 2001
From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 23 Feb 2006 08:33:04 +0000
Subject: [PATCH] Fix for compilers without variadic macros support.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@540 38d2e660-2303-0410-9eaa-f027e97ec537
---
 cfg/debug.h | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/cfg/debug.h b/cfg/debug.h
index 38029081..f040b37f 100755
--- a/cfg/debug.h
+++ b/cfg/debug.h
@@ -17,6 +17,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/02/23 08:33:04  bernie
+ *#* Fix for compilers without variadic macros support.
+ *#*
  *#* Revision 1.7  2006/02/20 02:01:56  bernie
  *#* Depend on cfg/os.h.
  *#*
@@ -184,8 +187,8 @@
 		#endif /* ASSERT */
 		#define ASSERT2(x, help)  ASSERT(help && x)
 
-		/*!
-		 * Check that the given pointer is not NULL or pointing to raw memory.
+		/**
+		 * Check that the given pointer is either NULL or pointing to valid memory.
 		 *
 		 * The assumption here is that valid pointers never point to low
 		 * memory regions.  This helps catching pointers taken from
@@ -193,10 +196,15 @@
 		 */
 		#define ASSERT_VALID_PTR(p)  ASSERT((unsigned long)(p) > 0x200)
 
+		/**
+		 * Check that the given pointer is not pointing to invalid memory.
+		 *
+		 * \see ASSERT_VALID_PTR()
+		 */
 		#define ASSERT_VALID_PTR_OR_NULL(p)  ASSERT((((p) == NULL) || ((unsigned long)(p) >= 0x200)))
 
 		#if !CONFIG_KDEBUG_DISABLE_TRACE
-			#define TRACE  kporintf("%s()\n", __func__)
+			#define TRACE  kprintf("%s()\n", __func__)
 			#define TRACEMSG(msg,...) kprintf("%s(): " msg, __func__, ## __VA_ARGS__)
 		#else
 			#define TRACE  do {} while(0)
@@ -348,7 +356,14 @@
 	#define ASSERT_VALID_PTR_OR_NULL(p)  ((void)0)
 	#define ASSERT_VALID_OBJ(_t, _o)     ((void)0)
 	#define TRACE                        do {} while (0)
-	#define TRACEMSG(x,...)              do {} while (0)
+	#if COMPILER_VARIADIC_MACROS
+		#define TRACEMSG(x, ...)         do {} while (0)
+	#else
+		INLINE void TRACEMSG(UNUSED_ARG(const char *, msg), ...)
+		{
+			/* NOP */
+		}
+	#endif
 
 	#define DECLARE_WALL(name, size)     /* nothing */
 	#define FWD_DECLARE_WALL(name, size) /* nothing */
@@ -368,12 +383,12 @@
 	INLINE void kputs(UNUSED_ARG(const char *, str)) { /* nop */ }
 	INLINE void kdump(UNUSED_ARG(const void *, buf), UNUSED_ARG(size_t, len)) { /* nop */ }
 
-	#ifdef __cplusplus
+	#if defined(__cplusplus) && COMPILER_VARIADIC_MACROS
 		/* G++ can't inline functions with variable arguments... */
 		#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 */
-- 
2.25.1