emulator: Fix compilation warnings

maruskin_operation.c, mloop_event.c

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/tizen/src/mloop_event.c b/tizen/src/mloop_event.c
index 1bdb225..d4a61eb 100644 (file)
--- a/tizen/src/mloop_event.c
+++ b/tizen/src/mloop_event.c
@@ -43,11 +43,12 @@
 #include "mloop_event.h"
 #include "console.h"
 #include "emul_state.h"
-#include "tizen/src/debug_ch.h"
+#include "debug_ch.h"
 #include "monitor.h"
 #include "pci.h"
 #include "sysemu.h"
 
+#include "emulator.h"
 #include "guest_debug.h"
 #include "skin/maruskin_server.h"
 #include "hw/maru_virtio_touchscreen.h"

diff --git a/tizen/src/skin/maruskin_keymap.h b/tizen/src/skin/maruskin_keymap.h
index b722dc9..37c7520 100644 (file)
--- a/tizen/src/skin/maruskin_keymap.h
+++ b/tizen/src/skin/maruskin_keymap.h
@@ -88,6 +88,10 @@ enum JAVA_KEYCODE {
 #define KEY_MAX 0777
 
 #define KEY_F0 0410
+
+#ifdef KEY_F
+#undef KEY_F
+#endif
 #define KEY_F(n) (KEY_F0 + (n))
 
 #define KEY_DOWN 0402

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 66839b2..a756e27 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -36,6 +36,7 @@
 #include "maruskin_operation.h"
 #include "hw/maru_brightness.h"
 #include "maru_display.h"
+#include "emulator.h"
 #include "debug_ch.h"
 #include "sdb.h"
 #include "nbd.h"
@@ -420,7 +421,7 @@ DetailInfo* get_detail_info(int qemu_argc, char** qemu_argv)
 
     /* collect log path information */
 #define LOGPATH_TEXT "log_path="
-    char* log_path = get_log_path();
+    const char* log_path = get_log_path();
     int log_path_len = strlen(LOGPATH_TEXT) + strlen(log_path) + delimiter_len;
     total_len += (log_path_len + 1);