glib r6909 - in trunk: . glib

[tml svn gnome org]

Author: tml
Date: Sun May 18 21:38:50 2008
New Revision: 6909
URL: http://svn.gnome.org/viewvc/glib?rev=6909&view=rev

Log:
2008-05-19  Tor Lillqvist  <tml novell com>

	* glib/Makefile.am: #define HELPER_CONSOLE in
	gspawn-win32-helper-console.c

	* glib/gspawn-win32-helper.c: Compile a main() instead of
	WinMain() if HELPER_CONSOLE is defined.



Modified:
   trunk/ChangeLog
   trunk/glib/Makefile.am
   trunk/glib/gspawn-win32-helper.c

Modified: trunk/glib/Makefile.am
==============================================================================
--- trunk/glib/Makefile.am	(original)
+++ trunk/glib/Makefile.am	Sun May 18 21:38:50 2008
@@ -298,7 +298,8 @@
 INSTALL_PROGS=
 
 gspawn-win32-helper-console.c:
-	echo '#include "gspawn-win32-helper.c"' >$@
+	echo '#define HELPER_CONSOLE' >$@
+	echo '#include "gspawn-win32-helper.c"' >>$@
 
 if OS_WIN32
 INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console

Modified: trunk/glib/gspawn-win32-helper.c
==============================================================================
--- trunk/glib/gspawn-win32-helper.c	(original)
+++ trunk/glib/gspawn-win32-helper.c	Sun May 18 21:38:50 2008
@@ -147,11 +147,16 @@
   return argc;
 }
 
+#ifndef HELPER_CONSOLE
 int _stdcall
 WinMain (struct HINSTANCE__ *hInstance,
 	 struct HINSTANCE__ *hPrevInstance,
 	 char               *lpszCmdLine,
 	 int                 nCmdShow)
+#else
+int
+main (int ignored_argc, char **ignored_argv)
+#endif
 {
   int child_err_report_fd = -1;
   int helper_sync_fd = -1;