[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-159-gcd3017c

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  cd3017cffa68e6f56419177e66332f86ab45675b (commit)
      from  804c0b2ad321247e50910511f691d987d8141081 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cd3017cffa68e6f56419177e66332f86ab45675b
Author: Alex Austin <ale...@sp...>
Date:   Fri Jan 29 00:41:44 2010 -0600

    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 <dbr...@us...>

diff --git a/src/helper/log.h b/src/helper/log.h
index ebcb8a1..b936fee 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 af19d01..8ff3532 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

-----------------------------------------------------------------------

Summary of changes:
 src/helper/log.h    |    7 ++++++-
 src/helper/system.h |    5 +++++
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository