From 5adfd065bbcd56f1c177f85d955b0d50d7ccc90d Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 26 Oct 2011 17:38:19 +0200 Subject: [PATCH] winegcc: Avoid including Windows headers in the Mingw unicode stub. --- tools/winegcc/winegcc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index adb1873dd2b..7d03119a5b5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -648,16 +648,17 @@ static const char *mingw_unicode_hack( struct options *opts ) char *main_stub = get_temp_file( opts->output_name, ".c" ); create_file( main_stub, 0644, - "#include \n" - "#include \n" - "#include \n" + "typedef unsigned short wchar_t;\n" + "extern void * __stdcall LoadLibraryA(const char *);\n" + "extern void * __stdcall GetProcAddress(void *,const char *);\n" + "extern int wmain( int argc, wchar_t *argv[] );\n\n" "int main( int argc, char *argv[] )\n{\n" " int wargc;\n" " wchar_t **wargv, **wenv;\n" - " HMODULE msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" - " void __cdecl (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" - " int *new_mode) = (void *)GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" - " __wgetmainargs( &wargc, &wargv, &wenv, 0, NULL );\n" + " void *msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" + " void (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" + " int *new_mode) = GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" + " __wgetmainargs( &wargc, &wargv, &wenv, 0, 0 );\n" " return wmain( wargc, wargv );\n}\n" ); return compile_to_object( opts, main_stub, NULL ); }