summaryrefslogtreecommitdiff
path: root/merrifield
diff options
context:
space:
mode:
authorVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2015-07-11 23:12:34 -0700
committerZhengyin Qian <qianzy@google.com>2015-12-03 15:05:29 -0800
commita47d9a7b7ea142998a482aa2fdce70a5ca4fe152 (patch)
tree37d83777a0e4516cbeec5745223349fe4138f218 /merrifield
parent126cf478969961ce64d064aa8bddb2a72335c0d5 (diff)
downloadhwcomposer-a47d9a7b7ea142998a482aa2fdce70a5ca4fe152.tar.gz
Fix M Upgrade Compilation issues
Change-Id: I24113f420e1180dbaf03efc3af2181cd6dd7eaf5 Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1012 Signed-off-by: Stephen Woo <stephen.m.woo@intel.com> Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com>
Diffstat (limited to 'merrifield')
-rw-r--r--merrifield/common/utils/HwcTrace.h10
-rw-r--r--merrifield/ips/common/WsbmWrapper.c1
2 files changed, 6 insertions, 5 deletions
diff --git a/merrifield/common/utils/HwcTrace.h b/merrifield/common/utils/HwcTrace.h
index 83151c6..2eb47a2 100644
--- a/merrifield/common/utils/HwcTrace.h
+++ b/merrifield/common/utils/HwcTrace.h
@@ -26,11 +26,11 @@ extern "C" {
#endif
// Helper to automatically preappend classname::functionname to the log message
-#define VTRACE(fmt,...) ALOGV("%s: "fmt, __func__, ##__VA_ARGS__)
-#define DTRACE(fmt,...) ALOGD("%s: "fmt, __func__, ##__VA_ARGS__)
-#define ITRACE(fmt,...) ALOGI("%s: "fmt, __func__, ##__VA_ARGS__)
-#define WTRACE(fmt,...) ALOGW("%s: "fmt, __func__, ##__VA_ARGS__)
-#define ETRACE(fmt,...) ALOGE("%s: "fmt, __func__, ##__VA_ARGS__)
+#define VTRACE(fmt,...) ALOGV("%s: " fmt, __func__, ##__VA_ARGS__)
+#define DTRACE(fmt,...) ALOGD("%s: " fmt, __func__, ##__VA_ARGS__)
+#define ITRACE(fmt,...) ALOGI("%s: " fmt, __func__, ##__VA_ARGS__)
+#define WTRACE(fmt,...) ALOGW("%s: " fmt, __func__, ##__VA_ARGS__)
+#define ETRACE(fmt,...) ALOGE("%s: " fmt, __func__, ##__VA_ARGS__)
// Function call tracing
diff --git a/merrifield/ips/common/WsbmWrapper.c b/merrifield/ips/common/WsbmWrapper.c
index 5e4161e..5e050a4 100644
--- a/merrifield/ips/common/WsbmWrapper.c
+++ b/merrifield/ips/common/WsbmWrapper.c
@@ -14,6 +14,7 @@
// limitations under the License.
*/
+#include <string.h>
#include <wsbm_pool.h>
#include <wsbm_driver.h>
#include <wsbm_manager.h>