mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-09 10:44:04 +02:00
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 23dffdd949
https://bugzilla.gnome.org/show_bug.cgi?id=780634
This commit is contained in:
@@ -1238,8 +1238,6 @@ g_spawn_check_exit_status (gint exit_status,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* !GSPAWN_HELPER */
|
|
||||||
|
|
||||||
#ifdef G_OS_WIN32
|
#ifdef G_OS_WIN32
|
||||||
|
|
||||||
/* Binary compatibility versions. Not for newly compiled code. */
|
/* 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);
|
return g_spawn_command_line_async (command_line, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif /* G_OS_WIN32 */
|
||||||
|
|
||||||
|
#endif /* !GSPAWN_HELPER */
|
||||||
|
Reference in New Issue
Block a user