From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZL7Lx-0008TM-Jv for qemu-devel@nongnu.org; Fri, 31 Jul 2015 06:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZL7Lt-0006Bb-1s for qemu-devel@nongnu.org; Fri, 31 Jul 2015 06:15:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZL7Ls-0006Ak-BY for qemu-devel@nongnu.org; Fri, 31 Jul 2015 06:15:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 167D591778 for ; Fri, 31 Jul 2015 10:15:44 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 31 Jul 2015 11:15:38 +0100 Message-Id: <1438337738-13356-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.4] gtk: avoid redefining _WIN32_WINNT macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 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