luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

#define HELPER_CONSOLE in gspawn-win32-helper-console.c

Browse Source 
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.


svn path=/trunk/; revision=6909
This commit is contained in:
Tor Lillqvist 2008-05-18 21:38:50 +00:00 committed by Tor Lillqvist
parent 78bdc9397b
commit fa60c1ecdf
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-05-18 Matthias Clasen <mclasen@redhat.com> 2008-05-18 Matthias Clasen <mclasen@redhat.com>
Bug 527214 – g_timer_elapsed() returns random values. Bug 527214 – g_timer_elapsed() returns random values.

3
glib/Makefile.am
View File

@ -298,7 +298,8 @@ libglib_2_0_la_LDFLAGS = \
INSTALL_PROGS= INSTALL_PROGS=
gspawn-win32-helper-console.c: gspawn-win32-helper-console.c:
echo '#include "gspawn-win32-helper.c"' >$@ echo '#define HELPER_CONSOLE' >$@
echo '#include "gspawn-win32-helper.c"' >>$@
if OS_WIN32 if OS_WIN32
INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console

5
glib/gspawn-win32-helper.c
View File

@ -147,11 +147,16 @@ protect_wargv (wchar_t **wargv,
return argc; return argc;
} }
#ifndef HELPER_CONSOLE
int _stdcall int _stdcall
WinMain (struct HINSTANCE__ *hInstance, WinMain (struct HINSTANCE__ *hInstance,
struct HINSTANCE__ *hPrevInstance, struct HINSTANCE__ *hPrevInstance,
char *lpszCmdLine, char *lpszCmdLine,
int nCmdShow) int nCmdShow)
#else
int
main (int ignored_argc, char **ignored_argv)
#endif
{ {
int child_err_report_fd = -1; int child_err_report_fd = -1;
int helper_sync_fd = -1; int helper_sync_fd = -1;