Fix compilation error on windows.
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 12 Jul 2013 05:33:48 +0000 (14:33 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 12 Jul 2013 05:33:48 +0000 (14:33 +0900)
Change-Id: Ib689d1efbb855a14fbe512e65e5fe89d84005208
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
block/raw-win32.c
qemu-char.c
util/oslib-win32.c

index bc7825927ae84a423ac35f8ece8e262a09f734bd..0a28e406cdd4600fc84bffd39726386e7de2eb32 100644 (file)
@@ -283,7 +283,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags)
     }
 #else
 #include <errno.h>
-       int open_flags, ret;
+       int open_flags;
 
        open_flags = O_BINARY & ~O_ACCMODE;
        if (flags & BDRV_O_RDWR) {
index aefa663b89e527f0c0e9a93c01836cdc646deec0..3c83444d47f996906f3aa78de568ac44af583f4a 100644 (file)
@@ -3527,7 +3527,7 @@ static CharDriverState *qmp_chardev_open_file(ChardevFile *file, Error **errp)
        int open_flags, ret;
 
        open_flags = O_BINARY | O_RDWR | O_CREAT | O_TRUNC;
-       ret = qemu_open(file_out, open_flags, 0644);
+       ret = qemu_open(file->out, open_flags, 0644);
        if (ret < 0) {
                error_report("qemu_chr_open_win_file_out failed(%d) \n", ret);
                return -errno;
index bdd37bc3a78f5aa9b67a59e866882070e83eec2d..ee481dbf789c4bf7494beec2e8ad7808a4e0d41b 100644 (file)
@@ -34,7 +34,6 @@
 
 #ifdef CONFIG_MARU
 #include "../../tizen/src/skin/maruskin_client.h"
-#endif
 
 typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
 LPFN_ISWOW64PROCESS fnIsWow64Process;