| Message ID | 1437583451-9677-6-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Wed, Jul 22, 2015 at 05:44:04PM +0100, Peter Maydell wrote: > 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> > --- > include/qemu-common.h | 17 ----------------- > include/sysemu/os-win32.h | 18 ++++++++++++++++++ > 2 files changed, 18 insertions(+), 17 deletions(-) Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel
diff --git a/include/qemu-common.h b/include/qemu-common.h index 237d654..9e622a5 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
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> --- include/qemu-common.h | 17 ----------------- include/sysemu/os-win32.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-)