modified lib/3rdparty/mingw/main.c

   Make -Wno-main redundant

modified   tools/rbuild/backend/mingw/modulehandler.cpp
   -Wno-main now redundant

svn path=/trunk/; revision=37850

diff --git a/reactos/lib/3rdparty/mingw/main.c b/reactos/lib/3rdparty/mingw/main.c
index f53ef06..d3d9457 100644 (file)
--- a/reactos/lib/3rdparty/mingw/main.c
+++ b/reactos/lib/3rdparty/mingw/main.c
@@ -20,7 +20,7 @@ extern int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrevInst,
                            LPSTR szCmdLine, int nShow);
 
 int
-main (int argc, const char *argv[], const char *environ[])
+main (int argc, const char *argv[])
 {
   char *szCmd;
   STARTUPINFO startinfo;

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index f6cfb0a..6e367c7 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -2009,16 +2009,6 @@ MingwModuleHandler::GenerateOtherMacros ()
                          linkerflags );
        }
 
-       if ( IsStaticLibrary ( module ) && module.isStartupLib )
-       {
-               fprintf ( fMakefile,
-                         "%s += -Wno-main\n\n",
-                         cflagsMacro.c_str () );
-               fprintf ( fMakefile,
-                         "%s += -Wno-main\n\n",
-                         cxxflagsMacro.c_str () );
-       }
-
        fprintf ( fMakefile, "\n\n" );
 
        // future references to the macros will be to get their values