From 19cd2a7ca4c1b18f8602f0a473faa421e089424f Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 15 Feb 2018 08:35:34 -0500
Subject: [PATCH] qemu-common.h: Move Win32 fixups into os-win32.h

qemu-common.h includes some fixups for things the Win32
headers don't define or define weirdly. These really
belong in os-win32.h, so move them there.

Backports commit 1aad8104f3b69206da1f868639e1f69c26f6d482 from qemu
---
 qemu/include/qemu-common.h     | 11 -----------
 qemu/include/sysemu/os-win32.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/qemu/include/qemu-common.h b/qemu/include/qemu-common.h
index 155f4e19..4bb13fbd 100644
--- a/qemu/include/qemu-common.h
+++ b/qemu/include/qemu-common.h
@@ -77,17 +77,6 @@
 # error Unknown pointer size
 #endif
 
-#ifdef _WIN32
-#define fsync _commit
-#if !defined(lseek)
-# define lseek _lseeki64
-#endif
-int qemu_ftruncate64(int, int64_t);
-#if !defined(ftruncate)
-# define ftruncate qemu_ftruncate64
-#endif
-#endif
-
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
 
diff --git a/qemu/include/sysemu/os-win32.h b/qemu/include/sysemu/os-win32.h
index 5d7b1d83..67058d7e 100644
--- a/qemu/include/sysemu/os-win32.h
+++ b/qemu/include/sysemu/os-win32.h
@@ -79,4 +79,15 @@ size_t getpagesize(void);
 # define EPROTONOSUPPORT EINVAL
 #endif
 
+#ifdef _WIN32
+#define fsync _commit
+#if !defined(lseek)
+# define lseek _lseeki64
+#endif
+int qemu_ftruncate64(int, int64_t);
+#if !defined(ftruncate)
+# define ftruncate qemu_ftruncate64
+#endif
+#endif
+
 #endif