Commit b803c0a2 authored by Christoph Reiter's avatar Christoph Reiter 🐍

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 23dffdd9

https://bugzilla.gnome.org/show_bug.cgi?id=780634
parent b60e4665
......@@ -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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment