From b803c0a224f88c4d9afac1ae967832c6d9633551 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 12 Jul 2017 23:36:18 +0200 Subject: [PATCH] gspawn-win32: Fix multiple definition error with a static build gspawn-win32.c gets included by gspawn-win32-helper.c and in case of a static build the definitions there clash with the ones from libglib. Fixed by not compiling the ABI comapt code in case GSPAWN_HELPER is defined. I missed this issue in commit 23dffdd949eb1c https://bugzilla.gnome.org/show_bug.cgi?id=780634 --- glib/gspawn-win32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index 2dfb4e889..8ed10d685 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -1238,8 +1238,6 @@ g_spawn_check_exit_status (gint exit_status, return ret; } -#endif /* !GSPAWN_HELPER */ - #ifdef G_OS_WIN32 /* Binary compatibility versions. Not for newly compiled code. */ @@ -1372,4 +1370,6 @@ g_spawn_command_line_async_utf8 (const gchar *command_line, return g_spawn_command_line_async (command_line, error); } -#endif +#endif /* G_OS_WIN32 */ + +#endif /* !GSPAWN_HELPER */