[ros-diffs] [tkreuzer] 37886: merge rbuild changes 37747, 37778 from trunk

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sat Dec 6 10:52:20 CET 2008


Author: tkreuzer
Date: Sat Dec  6 03:52:19 2008
New Revision: 37886

URL: http://svn.reactos.org/svn/reactos?rev=37886&view=rev
Log:
merge rbuild changes 37747,37778 from trunk

Modified:
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
    branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=37886&r1=37885&r2=37886&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Dec  6 03:52:19 2008
@@ -826,7 +826,7 @@
 	buffer[i] = '\0';
 	pclose ( fp );
 
-	char separators[] = " ";
+	char separators[] = " ()";
 	char *token;
 	char *prevtoken = NULL;
 

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp?rev=37886&r1=37885&r2=37886&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] Sat Dec  6 03:52:19 2008
@@ -390,7 +390,7 @@
 	s = s + sprintf ( s, "}\n" );
 	s = s + sprintf ( s, "\n" );
 	s = s + sprintf ( s, "int\n" );
-	s = s + sprintf ( s, "STDCALL\n" );
+	s = s + sprintf ( s, "WINAPI\n" );
 	s = s + sprintf ( s, "WinMain(HINSTANCE hInstance,\n" );
 	s = s + sprintf ( s, "  HINSTANCE hPrevInstance,\n" );
 	s = s + sprintf ( s, "  LPSTR lpszCmdParam,\n" );



More information about the Ros-diffs mailing list