aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2014-07-11 03:01:42 +0800
committerMilan Crha <mcrha@redhat.com>2014-07-11 03:01:42 +0800
commitfa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231 (patch)
treef315f05c15fd4973a30f8dff1a29477ac8c2f803 /modules
parent1690e6760f23f95f245d4acde8c768ccdedfc3b8 (diff)
downloadgsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar
gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.gz
gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.bz2
gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.lz
gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.xz
gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.zst
gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.zip
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.
Diffstat (limited to 'modules')
-rw-r--r--modules/book-config-ldap/evolution-book-config-ldap.c5
-rw-r--r--modules/plugin-lib/e-plugin-lib.c2
2 files changed, 1 insertions, 6 deletions
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>