commit 3576592b6977676ac0e0765ffa2eae1aa671ce2c
author Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Thu May 23 12:27:07 2013 +0200
committer Amit Pundir <amit.pundir@linaro.org> Thu Jul 25 05:19:59 2013 +0530
tree 3f19b5ab0eaa2169686847e0aec339fa47e20f69
parent 363cef472e275f4900dc4916acd03718c7d57284

exynos5: Fix build with gcc 4.8

log.h uses constructs that gcc 4.8 warns about because they
can be interpreted as C++11 string literals.
Since it is built with -Werror, this causes the build to fail.

Change-Id: I63121247efb7d42377fdd7606cdb5b5a67b9b232
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

mobicore/common/LogWrapper/log.h

diff --git a/mobicore/common/LogWrapper/log.h b/mobicore/common/LogWrapper/log.h
index 36c1746..2ffc0b2 100644
--- a/mobicore/common/LogWrapper/log.h
+++ b/mobicore/common/LogWrapper/log.h
@@ -68,8 +68,8 @@
     #define LOG_W(fmt, args...) DUMMY_FUNCTION()
 #else
     // add LINE
-    #define LOG_I(fmt, args...) LOG_i(fmt";%d", ## args, __LINE__)
-    #define LOG_W(fmt, args...) LOG_w(fmt";%d", ## args, __LINE__)
+    #define LOG_I(fmt, args...) LOG_i(fmt ";%d", ## args, __LINE__)
+    #define LOG_W(fmt, args...) LOG_w(fmt ";%d", ## args, __LINE__)
 #endif
     // LOG_E is always defined
     #define _LOG_E(fmt, args...) LOG_e(fmt, ## args)
@@ -98,10 +98,10 @@
     #define LOG_I(fmt, args...) DUMMY_FUNCTION()
     #define LOG_W(fmt, args...) DUMMY_FUNCTION()
 #else
-    #define LOG_I(...)  _LOG_x("I",__VA_ARGS__)
-    #define LOG_W(...)  _LOG_x("W",__VA_ARGS__)
+    #define LOG_I(...)  _LOG_x("I", __VA_ARGS__)
+    #define LOG_W(...)  _LOG_x("W", __VA_ARGS__)
 #endif
-    #define _LOG_E(...)  _LOG_x("E",__VA_ARGS__)
+    #define _LOG_E(...)  _LOG_x("E", __VA_ARGS__)
 
 #endif //defined(LOG_ANDROID)
 
@@ -118,7 +118,7 @@
             do \
             { \
                 _LOG_E("  *****************************"); \
-                _LOG_E("  *** ERROR: "__VA_ARGS__); \
+                _LOG_E("  *** ERROR: " __VA_ARGS__); \
                 _LOG_E("  *** Detected in %s:%i/%s()", __FILE__, __LINE__, __FUNCTION__); \
                 _LOG_E("  *****************************"); \
             } while(1!=1)