diff options
| author | Vincent Untz <vuntz@gnome.org> | 2009-01-23 04:44:01 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2009-01-23 04:44:01 +0000 |
| commit | 6e85c753811809e22beb9e53fd46c5b35722a049 (patch) | |
| tree | 0e59c4e309245a500cdb12414d912354eec662c3 | |
| parent | bf912568214dbde4449f1a54670ee6b8ff28f47f (diff) | |
| download | gconf-6e85c753811809e22beb9e53fd46c5b35722a049.tar.gz | |
cygwin needs the same stuff as mingw, so use G_PLATFORM_WIN32 Patch by
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.
svn path=/trunk/; revision=2740
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | backends/xml-backend.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -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* |