diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-19 16:20:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-19 16:29:53 +0100 |
| commit | 1aad8104f3b69206da1f868639e1f69c26f6d482 (patch) | |
| tree | b60507b4430d825a284fe8d9cae633c790809d15 | |
| parent | 24134c4e9126bf505b612e901c63a102fc471083 (diff) | |
| download | qemu-1aad8104f3b69206da1f868639e1f69c26f6d482.zip qemu-1aad8104f3b69206da1f868639e1f69c26f6d482.tar.gz qemu-1aad8104f3b69206da1f868639e1f69c26f6d482.tar.bz2 | |
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.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | include/qemu-common.h | 17 | ||||
| -rw-r--r-- | include/sysemu/os-win32.h | 18 |
2 files changed, 18 insertions, 17 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index fb3da6c..d165000 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -86,23 +86,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 - -static inline char *realpath(const char *path, char *resolved_path) -{ - _fullpath(resolved_path, path, _MAX_PATH); - return resolved_path; -} -#endif - void cpu_ticks_init(void); /* icount */ diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index 4035c4f..706d85a 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -109,4 +109,22 @@ static inline int os_mlock(void) return -ENOSYS; } +#define fsync _commit + +#if !defined(lseek) +# define lseek _lseeki64 +#endif + +int qemu_ftruncate64(int, int64_t); + +#if !defined(ftruncate) +# define ftruncate qemu_ftruncate64 +#endif + +static inline char *realpath(const char *path, char *resolved_path) +{ + _fullpath(resolved_path, path, _MAX_PATH); + return resolved_path; +} + #endif |