From nobody Fri Nov 7 00:49:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544629449701506.579319595118; Wed, 12 Dec 2018 07:44:09 -0800 (PST) Received: from localhost ([::1]:45663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6gC-0000wT-Fj for importer@patchew.org; Wed, 12 Dec 2018 10:44:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6Ma-0000rR-Hp for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6MX-0000EP-9X for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:52 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:42667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6MW-00006K-Ue for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:49 -0500 Received: by mail-wr1-x430.google.com with SMTP id q18so18082005wrx.9 for ; Wed, 12 Dec 2018 07:23:40 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.23.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=206uFamUArYeYiHIML1Y2Dprs3f9bLhrSp5zPwAXXPQ=; b=PTkNl7aBSsRFWbbujuOm/12G79j8S0zTnDWhqhdtziolwUh7J6Gv6VWVF5IKt0brWa FzM5TgHPHtsRgt/J1LbBjsnQCbAO/efMUDQizF9eA10F/uRAepESl6sOBfS9MEJofhkK N+n4nexXaGNCirs35+7fjg4Pi+5fHxIXq3ld8HsTFHcVYhdHL1eUc+3oUN7pRCppY1QN 7UWfwOj/zF+9Kr8hJ3n1C2tTm+crwltXONuwq8vyJ1uIkxT+iMljxfWTRw6YO/OvY5AA d5FI5ixM3RtaioIo7458WbOFmKmBJm/faLLNlegdm53/PJMfSFL4PLuTOA8vxILyePg7 XMDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=206uFamUArYeYiHIML1Y2Dprs3f9bLhrSp5zPwAXXPQ=; b=jE28sZ3b8HmUcyIIk4RoTFXLj15eXcZqUSG3iNEE0oBfCreRUoT0ms7ISAg1n35ZwB F2I4xBbsjbS5RhCfbmWiJ5hWa7Xm6Erhl9ANHwA2M0z611FG4o070FBZ4U8iW4SW8jQi l6XgaiYuM0qCKuDaq7Tzdl76Ej1MCleXNUQnhUv0smVA1zKt2tfa+0ZDOp4Dl78u4qlt RnddkObGgpi/S+YguwCYZwd3mUcw62lubDPqyVnFYDXBnmkRjkb59mHoJwPobSr9H0nG teByosznIKa2qEnTSNqtXnoNXYYsTZtTcKAADrMr6LoYI1ayglotR0NiyRISL53/NbED 8FhA== X-Gm-Message-State: AA+aEWbGRxj9nBgPRGqrWiPz2a28tZuECHEpnxS5MbgmfJC2t78frPsn Ny34eixttVf/wikdDxQK5kXXMfXA X-Google-Smtp-Source: AFSGD/WZD/+V4RaVFFcGm/96ir/QqRLdANpbtvTyR0DN0CO9QRUv67enUZV8OpPAcVvFr3uFiJJqCg== X-Received: by 2002:adf:8b4d:: with SMTP id v13mr17134005wra.282.1544628219044; Wed, 12 Dec 2018 07:23:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:22:40 +0100 Message-Id: <1544628195-37728-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 19/54] build-sys: move windows defines in osdep.h header X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau 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=C3=A9 Lureau Message-Id: <20181122110039.15972-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 3 --- include/qemu/osdep.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 0a3c6a7..8c292ef 100755 --- a/configure +++ b/configure @@ -905,9 +905,6 @@ fi if test "$mingw32" =3D "yes" ; then EXESUF=3D".exe" DSOSUF=3D".dll" - QEMU_CFLAGS=3D"-DWIN32_LEAN_AND_MEAN -DWINVER=3D0x501 $QEMU_CFLAGS" - # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) - QEMU_CFLAGS=3D"-D__USE_MINGW_ANSI_STDIO=3D1 $QEMU_CFLAGS" # MinGW needs -mthreads for TLS and macro _MT. QEMU_CFLAGS=3D"-mthreads $QEMU_CFLAGS" LIBS=3D"-lwinmm -lws2_32 -liphlpapi $LIBS" diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 3bf48bc..7b6e5db 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -74,13 +74,30 @@ typedef __float128 _Float128; extern int daemon(int, int); #endif =20 +#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 #include #include #include #include #include + +/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ +#ifdef __MINGW32__ +#define __USE_MINGW_ANSI_STDIO 1 +#endif #include + #include #include #include --=20 1.8.3.1