From f1305982b84adfe04cdeb2686c3b1d7ed3a37bc7 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Wed, 25 Jun 2014 23:05:33 +0200
Subject: fix windows build (gtk3) partly. broken because of windows.h poluting
 namespace with "interface" struct name.

(bzr r13341.1.68)
---
 src/ui/dialog/filedialogimpl-win32.h | 3 ++-
 src/ui/dialog/print.cpp              | 9 +++++----
 src/ui/widget/preferences-widget.cpp | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h
index c523f041d..f77249abd 100644
--- a/src/ui/dialog/filedialogimpl-win32.h
+++ b/src/ui/dialog/filedialogimpl-win32.h
@@ -22,13 +22,14 @@
 #endif
 #endif
 
+#include "filedialogimpl-gtkmm.h"
+ 
 #include "gc-core.h"
  // define WINVER high enough so we get the correct OPENFILENAMEW size
 #ifndef WINVER
 #define WINVER 0x0500 
 #endif
 #include <windows.h>
-#include "filedialogimpl-gtkmm.h"
 
 
 namespace Inkscape
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 03ac9dc64..459e64041 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -13,10 +13,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#ifdef WIN32
-#include <io.h>
-#include <windows.h>
-#endif
 
 #include "print.h"
 #include <gtkmm/stock.h>
@@ -33,6 +29,11 @@
 
 #include <glibmm/i18n.h>
 
+#ifdef WIN32
+#include <io.h>
+#include <windows.h>
+#endif
+
 
 static void draw_page(
 #ifdef WIN32
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 3ba00c083..7f3e6cd47 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -14,10 +14,6 @@
 # include <config.h>
 #endif
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
 #endif
@@ -49,6 +45,10 @@
 #include <glibmm/convert.h>
 #include <glibmm/i18n.h>
 
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 using namespace Inkscape::UI::Widget;
 
 namespace Inkscape {
-- 
cgit v1.2.3