From fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 10 Jul 2014 21:01:42 +0200
Subject: Bug 722068 - Make Evolution build under Win32

This also makes gnome-desktop an optional dependency, which can
be avoided with --disable-gnome-desktop configure option.
---
 shell/e-shell-window-private.c | 2 +-
 shell/main.c                   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'shell')

diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 67612063e6..7a84b2e118 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -260,9 +260,9 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 	GtkWindow *window;
 	guint merge_id;
 	const gchar *id;
+	GSettings *settings;
 
 #ifndef G_OS_WIN32
-	GSettings *settings;
 	GtkActionGroup *action_group;
 #endif
 
diff --git a/shell/main.c b/shell/main.c
index 3125cd55b2..62d24561f3 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -38,7 +38,9 @@
 #ifdef DATADIR
 #undef DATADIR
 #endif
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601
+#endif
 #include <windows.h>
 #include <conio.h>
 #include <io.h>
@@ -48,6 +50,9 @@
 #ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION
 #define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002
 #endif
+
+#include "e-util/e-util-private.h"
+
 #endif
 
 #include <libxml/xmlmemory.h>
-- 
cgit v1.2.3