[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/35] build-sys: move windows defines in osdep.h hea
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 19/35] build-sys: move windows defines in osdep.h header |
Date: |
Tue, 18 Dec 2018 00:16:44 +0100 |
From: Marc-André Lureau <address@hidden>
This removes some clutter in compilation logging, and allows some
easier tweaking per compilation unit/CFLAGS overriding.
Note that we can't move those define in os-win32.h, since they must be
set before the first system headers are included.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 3 ---
include/qemu/osdep.h | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 0886f45bf4..b4f7279f4d 100755
--- a/configure
+++ b/configure
@@ -905,9 +905,6 @@ fi
if test "$mingw32" = "yes" ; then
EXESUF=".exe"
DSOSUF=".dll"
- QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
- # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later)
- QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"
# MinGW needs -mthreads for TLS and macro _MT.
QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"
LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 3bf48bcdec..7b6e5db9d0 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -74,13 +74,30 @@ typedef __float128 _Float128;
extern int daemon(int, int);
#endif
+#ifdef _WIN32
+/* as defined in sdkddkver.h */
+#ifndef WINVER
+#define WINVER 0x0501 /* XP */
+#endif
+/* reduces the number of implicitly included headers */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#endif
+
#include <stdarg.h>
#include <stddef.h>
#include <stdbool.h>
#include <stdint.h>
#include <sys/types.h>
#include <stdlib.h>
+
+/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */
+#ifdef __MINGW32__
+#define __USE_MINGW_ANSI_STDIO 1
+#endif
#include <stdio.h>
+
#include <string.h>
#include <strings.h>
#include <inttypes.h>
--
2.20.1
- [Qemu-devel] [PULL 09/35] memory: avoid unnecessary coalesced_io_del operations, (continued)
- [Qemu-devel] [PULL 09/35] memory: avoid unnecessary coalesced_io_del operations, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 10/35] memory: update coalesced_range on transaction_commit, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 11/35] hax: Support for Linux hosts, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 13/35] block/iscsi: take iscsilun->mutex in iscsi_timed_check_events(), Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 12/35] block/iscsi: drop unused IscsiAIOCB->buf field, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 15/35] block/iscsi: cancel libiscsi task when ABORT TASK TMF completes, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 16/35] esp-pci: Fix status register write erase control, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 14/35] block/iscsi: fix ioctl cancel use-after-free, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 17/35] scsi: esp: Defer command completion until previous interrupts have been handled, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 18/35] build-sys: don't include windows.h, osdep.h does it, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 19/35] build-sys: move windows defines in osdep.h header,
Paolo Bonzini <=
- [Qemu-devel] [PULL 20/35] build-sys: build with Vista API by default, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 21/35] qga: drop < Vista compatibility, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 24/35] qemu/queue.h: do not access tqe_prev directly, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 23/35] test: replace gtester with a TAP driver, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 25/35] vfio: make vfio_address_spaces static, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 26/35] qemu/queue.h: leave head structs anonymous unless necessary, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 27/35] qemu/queue.h: typedef QTAILQ heads, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 31/35] checkpatch: warn about qemu/queue.h head structs that are not typedef-ed, Paolo Bonzini, 2018/12/17
- [Qemu-devel] [PULL 28/35] qemu/queue.h: remove Q_TAILQ_{HEAD, ENTRY}, Paolo Bonzini, 2018/12/17