Commit cbcdf0dc authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Cleanup previous commit

parent 73a3e8a9
...@@ -173,21 +173,12 @@ static char **vlc_parse_cmdline( const char *psz_cmdline, int *i_args ) ...@@ -173,21 +173,12 @@ static char **vlc_parse_cmdline( const char *psz_cmdline, int *i_args )
# define wWinMain WinMain # define wWinMain WinMain
#endif #endif
#ifdef IF_MINGW_SUPPORTED_UNICODE
/***************************************************************************** /*****************************************************************************
* wWinMain: parse command line, start interface and spawn threads. * wWinMain: parse command line, start interface and spawn threads.
*****************************************************************************/ *****************************************************************************/
int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPWSTR lpCmdLine, int nCmdShow ) LPWSTR lpCmdLine, int nCmdShow )
{ {
#else
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR args, int nCmdShow )
{
/* This makes little sense, but at least it links properly */
wchar_t lpCmdLine[strlen(args) * 3];
MultiByteToWideChar( CP_ACP, 0, args, -1, lpCmdLine, sizeof(lpCmdLine) );
#endif
char **argv, psz_cmdline[wcslen(lpCmdLine) * 4]; char **argv, psz_cmdline[wcslen(lpCmdLine) * 4];
int argc, ret; int argc, ret;
...@@ -214,3 +205,14 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, ...@@ -214,3 +205,14 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
libvlc_exception_clear (&ex); libvlc_exception_clear (&ex);
return ret; return ret;
} }
#ifndef IF_MINGW_SUPPORTED_UNICODE
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR args, int nCmdShow)
{
/* This makes little sense, but at least it links properly */
wchar_t lpCmdLine[strlen(args) * 3];
MultiByteToWideChar( CP_ACP, 0, args, -1, lpCmdLine, sizeof(lpCmdLine) );
return wWinMain (hInstance, hPrevInstance, lpCmdLine, nCmdShow);
}
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment