summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorAlex Austin <alex.austin@spectrumdsi.com>2010-01-29 00:41:44 -0600
committerDavid Brownell <dbrownell@users.sourceforge.net>2010-01-29 00:02:12 -0800
commitcd3017cffa68e6f56419177e66332f86ab45675b (patch)
tree0c7a94e7a58b23e0763ec9c7ebcf92f07c72bc27 /src/helper
parent804c0b2ad321247e50910511f691d987d8141081 (diff)
downloadopenocd_libswd-cd3017cffa68e6f56419177e66332f86ab45675b.tar.gz
openocd_libswd-cd3017cffa68e6f56419177e66332f86ab45675b.tar.bz2
openocd_libswd-cd3017cffa68e6f56419177e66332f86ab45675b.tar.xz
openocd_libswd-cd3017cffa68e6f56419177e66332f86ab45675b.zip
Clang buildfixes
Building with clang took a few very small changes. The change to helper/log.h is because clang doesn't like an expression where the result is unused. In helper/system.h, I just defined true and false since clang doesn't have them builtin. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/log.h7
-rw-r--r--src/helper/system.h5
2 files changed, 11 insertions, 1 deletions
diff --git a/src/helper/log.h b/src/helper/log.h
index ebcb8a15..b936fee1 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -111,7 +111,12 @@ extern int debug_level;
#define LOG_LEVEL_IS(FOO) ((debug_level) >= (FOO))
#define LOG_DEBUG(expr ...) \
- ((debug_level >= LOG_LVL_DEBUG) ? log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr) , 0 : 0)
+ do { \
+ if (debug_level >= LOG_LVL_DEBUG) \
+ log_printf_lf(LOG_LVL_DEBUG, \
+ __FILE__, __LINE__, __func__, \
+ expr); \
+ } while (0)
#define LOG_INFO(expr ...) \
log_printf_lf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr)
diff --git a/src/helper/system.h b/src/helper/system.h
index af19d018..8ff3532a 100644
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -85,4 +85,9 @@
#include <fcntl.h>
#endif
+#ifndef true
+#define true 1
+#define false 0
+#endif
+
#endif // SYSTEM_H