emulator: remove compiler warnings and error on Windows.

DIV variable was not difined.

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

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index c35a3df3a3b84721e4c629270ccfa170c4f8441b..fb39554574f7429752a2ab6127f40cc347a895aa 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -57,10 +57,7 @@
 #include <SDL.h>
 #endif
 
-#if defined(CONFIG_WIN32)
-#include <windows.h>
-#elif defined(CONFIG_LINUX)
-#elif defined(CONFIG_DARWIN)
+#ifndef CONFIG_WIN32
 #include "ns_event.h"
 #endif
 

diff --git a/tizen/src/osutil-win32.c b/tizen/src/osutil-win32.c
index 65b4731f483d15f64a827b1cdf1c2757b6ede02d..02555ceac76d0d9dd714b7e11df6d5a502ce3847 100644 (file)
--- a/tizen/src/osutil-win32.c
+++ b/tizen/src/osutil-win32.c
@@ -143,8 +143,8 @@ void print_system_info_os(void)
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 
     if (GetVersionEx(&osvi)) {
-        INFO("* MajorVersion : %d, MinorVersion : %d, BuildNumber : %d, \
-            PlatformId : %d, CSDVersion : %s\n", osvi.dwMajorVersion,
+        INFO("* MajorVersion : %d, MinorVersion : %d, BuildNumber : %d, "
+            "PlatformId : %d, CSDVersion : %s\n", osvi.dwMajorVersion,
             osvi.dwMinorVersion, osvi.dwBuildNumber,
             osvi.dwPlatformId, osvi.szCSDVersion);
     }
@@ -161,5 +161,5 @@ void print_system_info_os(void)
     memInfo.dwLength = sizeof(MEMORYSTATUSEX);
     GlobalMemoryStatusEx(&memInfo);
     INFO("* Total Ram : %llu kB, Free: %lld kB\n",
-            memInfo.ullTotalPhys / DIV, memInfo.ullAvailPhys / DIV);
+            memInfo.ullTotalPhys / 1024, memInfo.ullAvailPhys / 1024);
 }

diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c
index a89c26fa508de025a7a7c3e6c78ab35009e61fc5..24722f9e3518b50d58edadc13ae8f6ca511731d0 100644 (file)
--- a/tizen/src/skin/maruskin_client.c
+++ b/tizen/src/skin/maruskin_client.c
@@ -49,7 +49,6 @@
 
 MULTI_DEBUG_CHANNEL(qemu, skin_client);
 
-
 #define SKIN_SERVER_READY_TIME 3 // second
 #define SKIN_SERVER_SLEEP_TIME 10 // milli second
 
@@ -65,6 +64,10 @@ extern int tizen_base_port;
 static int skin_argc;
 static char** skin_argv;
 
+#ifdef CONFIG_WIN32
+static char* JAVA_EXEFILE_PATH = NULL;
+#endif
+
 static void* run_skin_client(void* arg)
 {
     char cmd[JAVA_MAX_COMMAND_LENGTH] = { 0, };
@@ -156,7 +159,7 @@ static void* run_skin_client(void* arg)
 #ifdef CONFIG_WIN32
     // for 64bit windows
     free(JAVA_EXEFILE_PATH);
-    JAVA_EXEFILE_PATH=0;
+    JAVA_EXEFILE_PATH = NULL;
 
     //WinExec( cmd, SW_SHOW );
     {

diff --git a/tizen/src/skin/maruskin_client.h b/tizen/src/skin/maruskin_client.h
index 9c3707dc33ac5eea6e5e5b60a1407a3638cd0054..4c42cc6d647ebf0183bb7fab5946485057c54415 100644 (file)
--- a/tizen/src/skin/maruskin_client.h
+++ b/tizen/src/skin/maruskin_client.h
@@ -49,7 +49,6 @@
 #define  MY_KEY_WOW64_64KEY 0x0100
 int is_wow64(void);
 int get_java_path(char**);
-static char* JAVA_EXEFILE_PATH = 0;
 #else
 #define JAVA_EXEFILE_PATH "java"
 #endif