aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2009-01-29 01:19:48 +0800
committerTor Lillqvist <tml@src.gnome.org>2009-01-29 01:19:48 +0800
commitb95a3586e3af5aad0e4c3322faa4daa06cf7b647 (patch)
tree17d05ca11154a9dce02dc797afa3f5b602404237
parente790f2dee0f819c7eed06dff0a690fcb55e9a30d (diff)
downloadgsoc2013-evolution-b95a3586e3af5aad0e4c3322faa4daa06cf7b647.tar.gz
gsoc2013-evolution-b95a3586e3af5aad0e4c3322faa4daa06cf7b647.tar.zst
gsoc2013-evolution-b95a3586e3af5aad0e4c3322faa4daa06cf7b647.zip
Make it compile on Windows, by Fridrich Strbra. (Just compile; little
2009-01-28 Tor Lillqvist <tml@novell.com> Make it compile on Windows, by Fridrich Strbra. (Just compile; little chance of it actually doing anything sensible on Windows at this point...) * Makefile.am: Use -no-undefined on Windows. Link with libeutil. * backup.c: Remove unused <sys/wait.h>. * backup-restore.c: Check HAVE_SYS_WAIT_H. svn path=/trunk/; revision=37148
-rw-r--r--plugins/backup-restore/ChangeLog12
-rw-r--r--plugins/backup-restore/Makefile.am3
-rw-r--r--plugins/backup-restore/backup-restore.c15
-rw-r--r--plugins/backup-restore/backup.c1
4 files changed, 27 insertions, 4 deletions
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index c45db43ff2..ce09142121 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,15 @@
+2009-01-28 Tor Lillqvist <tml@novell.com>
+
+ Make it compile on Windows, by Fridrich Strbra. (Just compile;
+ little chance of it actually doing anything sensible on Windows at
+ this point...)
+
+ * Makefile.am: Use -no-undefined on Windows. Link with libeutil.
+
+ * backup.c: Remove unused <sys/wait.h>.
+
+ * backup-restore.c: Check HAVE_SYS_WAIT_H.
+
2009-01-21 Milan Crha <mcrha@redhat.com>
* Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS.
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index 19aed9c479..f93a3c7460 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -21,7 +21,8 @@ plugin_LTLIBRARIES = liborg-gnome-backup-restore.la
liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_backup_restore_la_LIBADD = \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(top_builddir)/e-util/libeutil.la
privlibexec_PROGRAMS = evolution-backup
evolution_backup_SOURCES = backup.c
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 3486844cc3..00d01c9709 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -18,9 +18,16 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <unistd.h>
#include <sys/types.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#include <stdlib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
@@ -71,9 +78,13 @@ sanity_check (const char *filename)
result = system (command);
g_free (command);
+#ifdef HAVE_SYS_WAIT_H
g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
- return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
+ return WIFEXITED (result) && (WEXITSTATUS (result) == 0); */
+#else
+ return result;
+#endif
}
static guint32
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 26c4fb958f..f7a42114aa 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/wait.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>