From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZZFCZ-0000H7-Qd for mharc-qemu-trivial@gnu.org; Tue, 08 Sep 2015 05:28:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZFCT-00007L-A6 for qemu-trivial@nongnu.org; Tue, 08 Sep 2015 05:28:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZFCN-0000tG-W2 for qemu-trivial@nongnu.org; Tue, 08 Sep 2015 05:28:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZFCI-0000pq-5A; Tue, 08 Sep 2015 05:28:14 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 5DF478AE6C; Tue, 8 Sep 2015 09:28:13 +0000 (UTC) Received: from dhcp-1-214.lcy.redhat.com (dhcp-1-214.lcy.redhat.com [10.32.224.214]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t889SATu023581; Tue, 8 Sep 2015 05:28:11 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 8 Sep 2015 10:28:08 +0100 Message-Id: <1441704488-9512-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-trivial@nongnu.org, "Daniel P. Berrange" , Gerd Hoffmann Subject: [Qemu-trivial] [PATCH repost] gtk: avoid redefining _WIN32_WINNT macro X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2015 09:28:30 -0000 When building for Mingw64 target on Fedora 22 a warning is issued about _WIN32_WINNT being redefined. 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:12, 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 is the location of the previous definition #define _WIN32_WINNT 0x502 ^ Signed-off-by: Daniel P. Berrange --- include/ui/gtk.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index ee6dffd..7796231 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -2,7 +2,9 @@ #define UI_GTK_H #ifdef _WIN32 -# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ +# endif #endif #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -- 2.4.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZFCN-0008SX-6n for qemu-devel@nongnu.org; Tue, 08 Sep 2015 05:28:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZFCI-0000q9-9M for qemu-devel@nongnu.org; Tue, 08 Sep 2015 05:28:19 -0400 From: "Daniel P. Berrange" Date: Tue, 8 Sep 2015 10:28:08 +0100 Message-Id: <1441704488-9512-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH repost] gtk: avoid redefining _WIN32_WINNT macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Gerd Hoffmann When building for Mingw64 target on Fedora 22 a warning is issued about _WIN32_WINNT being redefined. 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:12, 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 is the location of the previous definition #define _WIN32_WINNT 0x502 ^ Signed-off-by: Daniel P. Berrange --- include/ui/gtk.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/ui/gtk.h b/include/ui/gtk.h index ee6dffd..7796231 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -2,7 +2,9 @@ #define UI_GTK_H #ifdef _WIN32 -# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ +# endif #endif #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -- 2.4.3