Skip to contentSkip to conversation

gtk: avoid redefining _WIN32_WINNT macro

PATCH Applied Daniel P. Berrange 3 participants 3 messages Sep 8, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 gtk: avoid redefining _WIN32_WINNT macro

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
 ^

Rather than try to get MAPVK_VK_TO_VSC defined indirectly by defining _WIN32_WINNT, instead just define it explicitly if missing.

---
 include/ui/gtk.h | 4 ----
 ui/gtk.c         | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)
include/ui/gtk.h +0 -4
index ee6dffd..0359333 100644
@@ -1,10 +1,6 @@
 #ifndef UI_GTK_H
 #define UI_GTK_H
 
-#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
ui/gtk.c +9 -0
index df2a79e..80d5c20 100644
@@ -104,6 +104,15 @@
 #define GDK_KEY_Pause GDK_Pause
 #endif
 
+/* 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)
 
 static const int modifier_keycode[] = {
Signature · 1 line
2.4.3
Acked-by on v2 1/1
#1 lore raw

----- Messaggio originale -----

Quoted 74 lines

Da: "Daniel P. Berrange" <[email protected]>
A: [email protected]
Cc: "Gerd Hoffmann" <[email protected]>, [email protected], "Paolo Bonzini" <[email protected]>, "Stefan Weil" <[email protected]>, "Daniel P. Berrange" <[email protected]>
Inviato: Martedì, 8 settembre 2015 12:34:35
Oggetto: [PATCH v2] gtk: avoid redefining _WIN32_WINNT macro

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
 ^

Rather than try to get MAPVK_VK_TO_VSC defined indirectly by defining _WIN32_WINNT, instead just define it explicitly if missing.

---
 include/ui/gtk.h | 4 ----
 ui/gtk.c         | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)
include/ui/gtk.h +0 -4
index ee6dffd..0359333 100644
@@ -1,10 +1,6 @@
 #ifndef UI_GTK_H
 #define UI_GTK_H
 
-#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

ui/gtk.c +9 -1
index df2a79e..80d5c20 100644
@@ -104,6 +104,15 @@
 #define GDK_KEY_Pause GDK_Pause
 #endif
 
+/* 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)
 
 static const int modifier_keycode[] = {
--
Quoted 3 lines

2.4.3

Nice, thanks!

Applied
#2 lore raw

Am 08.09.2015 um 15:53 schrieb Paolo Bonzini:

Quoted 83 lines

----- Messaggio originale -----

Quoted 74 lines

Da: "Daniel P. Berrange" <[email protected]>
A: [email protected]
Cc: "Gerd Hoffmann" <[email protected]>, [email protected], "Paolo Bonzini" <[email protected]>, "Stefan Weil" <[email protected]>, "Daniel P. Berrange" <[email protected]>
Inviato: Martedì, 8 settembre 2015 12:34:35
Oggetto: [PATCH v2] gtk: avoid redefining _WIN32_WINNT macro

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
 ^

Rather than try to get MAPVK_VK_TO_VSC defined indirectly by defining _WIN32_WINNT, instead just define it explicitly if missing.

---
 include/ui/gtk.h | 4 ----
 ui/gtk.c         | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)
include/ui/gtk.h +0 -4
index ee6dffd..0359333 100644
@@ -1,10 +1,6 @@
 #ifndef UI_GTK_H
 #define UI_GTK_H
 
-#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

ui/gtk.c +9 -1
index df2a79e..80d5c20 100644
@@ -104,6 +104,15 @@
 #define GDK_KEY_Pause GDK_Pause
 #endif
 
+/* 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)
 
 static const int modifier_keycode[] = {
--
Quoted 3 lines

2.4.3

Nice, thanks!

Quoted 2 lines

Thanks, applied to my Windows patch queue
(git://qemu.weilnetz.de/qemu.git wxx)

Stefan