[glib] gspawn-win32: Fix multiple definition error with a static build



commit b803c0a224f88c4d9afac1ae967832c6d9633551
Author: Christoph Reiter <creiter src gnome org>
Date:   Wed Jul 12 23:36:18 2017 +0200

    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 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index 2dfb4e8..8ed10d6 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 */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]