Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.

[bertos.git] / cfg / debug.h

diff --git a/cfg/debug.h b/cfg/debug.h
index f040b37f831e9057181363c84cdf667f5396effe..3b077448e0db3c9615041d8c97a1926c074ad8ca 100755 (executable)
--- a/cfg/debug.h
+++ b/cfg/debug.h
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -103,18 +112,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,8 +186,22 @@
                {
                        fputs(str, stderr);
                }
-               /* G++ can't inline functions with variable arguments... */
-               #define kprintf(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+               #if COMPILER_VARIADIC_MACROS
+                       /* G++ can't inline functions with variable arguments... */
+                       #define kprintf(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)
+               #else
+                       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
                #define kvprintf(fmt, ap) vfprintf(stderr, fmt, ap)
                void kdump(const void *buf, size_t len); /* UNIMPLEMENTED */
 
@@ -205,7 +229,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)