diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-06-25 21:05:33 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-06-25 21:05:33 +0000 |
| commit | f1305982b84adfe04cdeb2686c3b1d7ed3a37bc7 (patch) | |
| tree | c5ec88a80d30eab6a827baec21b030806a7ce4b9 /src/ui/widget/preferences-widget.cpp | |
| parent | fix bug introduced in rev. 13403 (merge with trunk) (diff) | |
| download | inkscape-f1305982b84adfe04cdeb2686c3b1d7ed3a37bc7.tar.gz inkscape-f1305982b84adfe04cdeb2686c3b1d7ed3a37bc7.zip | |
fix windows build (gtk3) partly. broken because of windows.h poluting namespace with "interface" struct name.
(bzr r13341.1.68)
Diffstat (limited to 'src/ui/widget/preferences-widget.cpp')
| -rw-r--r-- | src/ui/widget/preferences-widget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |