Author: hpoussin Date: Thu May 8 11:48:39 2008 New Revision: 33372
URL: http://svn.reactos.org/svn/reactos?rev=33372&view=rev Log: Fix sc.exe compilation by removing hack
Modified: trunk/reactos/base/applications/sc/sc.c
Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?r... ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Thu May 8 11:48:39 2008 @@ -189,10 +189,6 @@ return 0; }
-#if defined(_UNICODE) && defined(__GNUC__) -static -#endif - int _tmain(int argc, LPCTSTR argv[]) { LPCTSTR Server = NULL; // remote machine @@ -236,42 +232,3 @@ argc-2); } } - - -#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 = (WCHAR**) malloc(argc * sizeof(WCHAR*)))) - { - /* convert the arguments */ - for (i = 0, j = 0; i < argc; i++) - { - if (!(argvW[i] = (WCHAR*) 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, (LPCTSTR *)argvW); - } - - /* free the arguments */ - for (i = 0; i < argc; i++) - { - if (argvW[i]) - free(argvW[i]); - } - free(argvW); - } - - return Ret; -} -#endif