emulator: removed compile warnings.

Change-Id: I6851ad5d1afadba3824118b4c1327ceff90fe7c4
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 28009cd..a57dee4 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -30,34 +30,41 @@
  *
  */
 
+#include <stdlib.h>
+#include <string.h>
 
-#include "maru_common.h"
+#include "qemu/config-file.h"
+#include "qemu/sockets.h"
+
+#include "build_info.h"
 #include "emulator.h"
-#include "osutil.h"
+#include "emul_state.h"
 #include "guest_debug.h"
-#include "sdb.h"
-#include "string.h"
-#include "skin/maruskin_server.h"
-#include "skin/maruskin_client.h"
 #include "guest_server.h"
-#include "emul_state.h"
-#include "qemu/sockets.h"
-#include "build_info.h"
+#include "hw/maru_camera_common.h"
+#include "hw/gloffscreen_test.h"
+#include "maru_common.h"
 #include "maru_err_table.h"
 #include "maru_display.h"
-//#include "qemu-config.h"
 #include "mloop_event.h"
-#include "hw/maru_camera_common.h"
-#include "hw/gloffscreen_test.h"
+#include "osutil.h"
+#include "sdb.h"
+#include "skin/maruskin_server.h"
+#include "skin/maruskin_client.h"
 #include "debug_ch.h"
 
-#include <stdlib.h>
 #ifdef CONFIG_SDL
 #include <SDL.h>
 #endif
+#ifdef CONFIG_LINUX
+#include <sys/ipc.h>
+#include <sys/shm.h>
+extern int g_shmid;
+#endif
 
 #ifdef CONFIG_DARWIN
 #include "ns_event.h"
+int thread_running = 1; /* Check if we need exit main */
 #endif
 
 MULTI_DEBUG_CHANNEL(qemu, main);
@@ -74,6 +81,8 @@ MULTI_DEBUG_CHANNEL(qemu, main);
 #define LCD_HEIGHT_PREFIX "height="
 
 #define MIDBUF  128
+#define LEN_MARU_KERNEL_CMDLINE 512
+gchar maru_kernel_cmdline[LEN_MARU_KERNEL_CMDLINE];
 
 gchar bin_path[PATH_MAX] = { 0, };
 gchar log_path[PATH_MAX] = { 0, };
@@ -84,26 +93,13 @@ char tizen_target_img_path[PATH_MAX];
 
 int enable_gl = 0;
 int enable_yagl = 0;
-
 int is_webcam_enabled;
 
-#define LEN_MARU_KERNEL_CMDLINE 512
-gchar maru_kernel_cmdline[LEN_MARU_KERNEL_CMDLINE];
-
 static int _skin_argc;
 static char **_skin_argv;
 static int _qemu_argc;
 static char **_qemu_argv;
 
-#if defined(CONFIG_LINUX)
-#include <sys/shm.h>
-extern int g_shmid;
-#endif
-
-#ifdef CONFIG_DARWIN
-int thread_running = 1; /* Check if we need exit main */
-#endif
-
 const gchar *get_log_path(void)
 {
     return log_path;
@@ -115,7 +111,7 @@ void exit_emulator(void)
     shutdown_skin_server();
     shutdown_guest_server();
 
-#if defined(CONFIG_LINUX)
+#ifdef CONFIG_LINUX
     /* clean up the vm lock memory by munkyu */
     if (shmctl(g_shmid, IPC_RMID, 0) == -1) {
         ERR("shmctl failed\n");
@@ -320,11 +316,11 @@ static void print_system_info(void)
     INFO("* Current time : %s\n", timeinfo);
 
 #ifdef CONFIG_SDL
-    /* Gets the version of the dynamically linked SDL library */
-    INFO("* Host sdl version : (%d, %d, %d)\n",
-        SDL_Linked_Version()->major,
-        SDL_Linked_Version()->minor,
-        SDL_Linked_Version()->patch);
+       /* Gets the version of the dynamically linked SDL library */
+       INFO("* Host sdl version : (%d, %d, %d)\n",
+                       SDL_Linked_Version()->major,
+                       SDL_Linked_Version()->minor,
+                       SDL_Linked_Version()->patch);
 #endif
 
     print_system_info_os();