From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZJLO-00084z-GD for qemu-devel@nongnu.org; Tue, 08 Sep 2015 09:53:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZJLN-0007C8-Id for qemu-devel@nongnu.org; Tue, 08 Sep 2015 09:53:54 -0400 Date: Tue, 8 Sep 2015 09:53:43 -0400 (EDT) From: Paolo Bonzini Message-ID: <1917133616.27415210.1441720423804.JavaMail.zimbra@redhat.com> In-Reply-To: <1441708475-27578-1-git-send-email-berrange@redhat.com> References: <1441708475-27578-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2] gtk: avoid redefining _WIN32_WINNT macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" Cc: qemu-trivial@nongnu.org, Stefan Weil , qemu-devel@nongnu.org, Gerd Hoffmann ----- Messaggio originale ----- > Da: "Daniel P. Berrange" > A: qemu-devel@nongnu.org > Cc: "Gerd Hoffmann" , qemu-trivial@nongnu.org, "Paolo = Bonzini" , "Stefan > Weil" , "Daniel P. Berrange" > Inviato: Marted=C3=AC, 8 settembre 2015 12:34:35 > Oggetto: [PATCH v2] gtk: avoid redefining _WIN32_WINNT macro >=20 > When building for Mingw64 target on Fedora 22 a warning > is issued about _WIN32_WINNT being redefined. >=20 > In file included from ui/gtk.c:40:0: > include/ui/gtk.h:5:0: warning: "_WIN32_WINNT" redefined > # define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_= VSC > */ > ^ > In file included from > /usr/i686-w64-mingw32/sys-root/mingw/include/crtdefs.h:10:0, > from /usr/i686-w64-mingw32/sys-root/mingw/include/stdio.= h:9, > from > /home/berrange/src/virt/qemu/include/qemu/fprintf-fn.h:1= 2, > from /home/berrange/src/virt/qemu/include/qemu-common.h:= 18, > from ui/gtk.c:37: > /usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h:225:0: note: this i= s > the location of the previous definition > #define _WIN32_WINNT 0x502 > ^ >=20 > Rather than try to get MAPVK_VK_TO_VSC defined indirectly > by defining _WIN32_WINNT, instead just define it explicitly > if missing. >=20 > Signed-off-by: Daniel P. Berrange > --- > include/ui/gtk.h | 4 ---- > ui/gtk.c | 9 +++++++++ > 2 files changed, 9 insertions(+), 4 deletions(-) >=20 > diff --git a/include/ui/gtk.h b/include/ui/gtk.h > index ee6dffd..0359333 100644 > --- a/include/ui/gtk.h > +++ b/include/ui/gtk.h > @@ -1,10 +1,6 @@ > #ifndef UI_GTK_H > #define UI_GTK_H > =20 > -#ifdef _WIN32 > -# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_= VSC > */ > -#endif > - > #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE > /* Work around an -Wstrict-prototypes warning in GTK headers */ > #pragma GCC diagnostic push > diff --git a/ui/gtk.c b/ui/gtk.c > index df2a79e..80d5c20 100644 > --- a/ui/gtk.c > +++ b/ui/gtk.c > @@ -104,6 +104,15 @@ > #define GDK_KEY_Pause GDK_Pause > #endif > =20 > +/* Some older mingw versions lack this constant or have > + * it conditionally defined */ > +#ifdef _WIN32 > +# ifndef MAPVK_VK_TO_VSC > +# define MAPVK_VK_TO_VSC 0 > +# endif > +#endif > + > + > #define HOTKEY_MODIFIERS (GDK_CONTROL_MASK | GDK_MOD1_MASK) > =20 > static const int modifier_keycode[] =3D { > -- > 2.4.3 >=20 >=20 Nice, thanks! Acked-by: Paolo Bonzini