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.
---
 modules/book-config-ldap/evolution-book-config-ldap.c | 5 -----
 modules/plugin-lib/e-plugin-lib.c                     | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c
index feb016734f..d76cbdba3d 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -25,15 +25,10 @@
 
 #include "e-source-ldap.h"
 
-#ifndef G_OS_WIN32
 #include <ldap.h>
 #ifndef SUNLDAP
 #include <ldap_schema.h>
 #endif
-#else
-#include <winldap.h>
-#include "openldap-extract.h"
-#endif
 
 /* Combo box ordering */
 #define LDAP_PORT  389
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c
index 46ddae3859..a97dd2476f 100644
--- a/modules/plugin-lib/e-plugin-lib.c
+++ b/modules/plugin-lib/e-plugin-lib.c
@@ -25,7 +25,7 @@
 #include "e-plugin-lib.h"
 
 #ifdef G_OS_WIN32
-#include <libedataserver/e-data-server-util.h> /* for e_util_replace_prefix() */
+#include <libedataserver/libedataserver.h> /* for e_util_replace_prefix() */
 #endif
 
 #include <string.h>
-- 
cgit v1.2.3