Revert "gatomic: statically assert that our assumptions hold"

[platform/upstream/glib.git] / glib / gspawn-win32.c

diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index 5bf9126..2acbde3 100644 (file)
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -45,6 +45,7 @@
 #include "config.h"
 
 #include "glib.h"
+#include "glib-private.h"
 #include "gprintfint.h"
 #include "glibintl.h"
 #include "gthread.h"
@@ -61,6 +62,7 @@
 #include <direct.h>
 #include <wchar.h>
 
+#ifndef GSPAWN_HELPER
 #ifdef G_SPAWN_WIN32_DEBUG
   static int debug = 1;
   #define SETUP_DEBUG() /* empty */
@@ -79,6 +81,7 @@
       }                                                        \
     G_STMT_END
 #endif
+#endif
 
 enum
 {
@@ -206,8 +209,8 @@ protect_argv (gchar  **argv,
   return argc;
 }
 
-G_DEFINE_QUARK ("g-exec-error-quark", g_spawn_error)
-G_DEFINE_QUARK ("g-spawn-exit-error-quark", g_spawn_exit_error)
+G_DEFINE_QUARK (g-exec-error-quark, g_spawn_error)
+G_DEFINE_QUARK (g-spawn-exit-error-quark, g_spawn_exit_error)
 
 gboolean
 g_spawn_async_utf8 (const gchar          *working_directory,
@@ -545,7 +548,6 @@ do_spawn_with_pipes (gint                 *exit_status,
   gchar *helper_process;
   CONSOLE_CURSOR_INFO cursor_info;
   wchar_t *whelper, **wargv, **wenvp;
-  extern gchar *_glib_get_dll_directory (void);
   gchar *glib_dll_directory;
 
   if (child_setup && !warned_about_child_setup)