[vlc-devel] commit: Cleanup previous commit ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Tue May 27 19:41:42 2008 +0300| [cbcdf0dcb952af84ea98ef25038c105b04fc8ca2]

Cleanup previous commit

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cbcdf0dcb952af84ea98ef25038c105b04fc8ca2
---

 src/winvlc.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/winvlc.c b/src/winvlc.c
index 6f065a9..810a67a 100644
--- a/src/winvlc.c
+++ b/src/winvlc.c
@@ -173,21 +173,12 @@ static char **vlc_parse_cmdline( const char *psz_cmdline, int *i_args )
 # define wWinMain WinMain
 #endif
 
-#ifdef IF_MINGW_SUPPORTED_UNICODE
 /*****************************************************************************
  * wWinMain: parse command line, start interface and spawn threads.
  *****************************************************************************/
 int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                     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];
     int argc, ret;
 
@@ -214,3 +205,14 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     libvlc_exception_clear (&ex);
     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