summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--backends/xml-backend.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c50a1282..4731e518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-01-23 Vincent Untz <vuntz@gnome.org>
+ * backends/xml-backend.c: cygwin needs the same stuff as mingw, so use
+ G_PLATFORM_WIN32
+ Patch by <yselkowitz@users.sourceforge.net>
+ Fix bug #563801.
+
+2009-01-23 Vincent Untz <vuntz@gnome.org>
+
* gconf/gconftool.c: (do_toggle): return value at the end of the
function.
Patch by Magnus Boman <captain.magnus@gmail.com>. Fix bug #567334
diff --git a/backends/xml-backend.c b/backends/xml-backend.c
index 140e3173..dab4c869 100644
--- a/backends/xml-backend.c
+++ b/backends/xml-backend.c
@@ -797,7 +797,7 @@ blow_away_locks (const char *address)
/* Initializer */
-#ifndef G_OS_WIN32
+#ifndef G_PLATFORM_WIN32
/* If we use G_MODULE_EXPORT, *only* thusly marked functions will be
* exported, and xml-test uses other ones, too.
*/
@@ -814,7 +814,7 @@ g_module_check_init (GModule *module)
return NULL;
}
-#ifndef G_OS_WIN32
+#ifndef G_PLATFORM_WIN32
G_MODULE_EXPORT
#endif
GConfBackendVTable*