[ros-diffs] [hpoussin] 33377: Fix route.exe compilation by removing hack

hpoussin at svn.reactos.org hpoussin at svn.reactos.org
Thu May 8 19:48:13 CEST 2008


Author: hpoussin
Date: Thu May  8 12:48:13 2008
New Revision: 33377

URL: http://svn.reactos.org/svn/reactos?rev=33377&view=rev
Log:
Fix route.exe compilation by removing hack

Modified:
    trunk/reactos/base/applications/network/route/route.c

Modified: trunk/reactos/base/applications/network/route/route.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/route/route.c?rev=33377&r1=33376&r2=33377&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/route/route.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/route/route.c [iso-8859-1] Thu May  8 12:48:13 2008
@@ -251,9 +251,6 @@
     return Error;
 }
 
-#if defined(_UNICODE) && defined(__GNUC__)
-static
-#endif
 int _tmain( int argc, TCHAR **argv )
 {
     if( argc < 2 )
@@ -267,41 +264,3 @@
     else
         return Usage();
 }
-
-#if defined(_UNICODE) && defined(__GNUC__)
-/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */
-int main( int argc, char **argv )
-{
-    WCHAR **argvW;
-    int i, j, Ret = 1;
-
-    if ((argvW = malloc(argc * sizeof(WCHAR*))))
-    {
-        /* convert the arguments */
-        for (i = 0, j = 0; i < argc; i++)
-        {
-            if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR))))
-            {
-                j++;
-            }
-            swprintf(argvW[i], L"%hs", argv[i]);
-        }
-
-        if (j == 0)
-        {
-            /* no error converting the parameters, call wmain() */
-            Ret = wmain(argc, argvW);
-        }
-
-        /* free the arguments */
-        for (i = 0; i < argc; i++)
-        {
-            if (argvW[i])
-                free(argvW[i]);
-        }
-        free(argvW);
-    }
-
-    return Ret;
-}
-#endif



More information about the Ros-diffs mailing list