gmacros.h: add G_GNUC_*_IGNORE_DEPRECATIONS macros for clang

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

diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index cfb7104..d98aba1 100644 (file)
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -62,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 */
@@ -80,6 +81,7 @@
       }                                                        \
     G_STMT_END
 #endif
+#endif
 
 enum
 {
@@ -588,7 +590,7 @@ do_spawn_with_pipes (gint                 *exit_status,
     goto cleanup_and_fail;
   
   new_argv = g_new (char *, argc + 1 + ARG_COUNT);
-  if (GetConsoleCursorInfo (GetStdHandle (STD_OUTPUT_HANDLE), &cursor_info))
+  if (GetConsoleWindow () != NULL)
     helper_process = HELPER_PROCESS "-console.exe";
   else
     helper_process = HELPER_PROCESS ".exe";