Author: akhaldi
Date: Mon Apr 21 11:06:42 2014
New Revision: 62852
URL: http://svn.reactos.org/svn/reactos?rev=62852&view=rev
Log:
[MSVC]
* Don't error on C4603 now that the PCH setup is well tested.
CORE-7716
Modified:
trunk/reactos/cmake/msvc.cmake
Modified: trunk/reactos/cmake/msvc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62852…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Apr 21 11:06:42 2014
@@ -56,8 +56,7 @@
# - C4163: 'identifier': not available as an intrinsic function
# - C4229: modifiers on data are ignored
# - C4700: uninitialized variable usage
-# - C4603: macro is not defined or definition is different after precompiled header use
-add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603")
+add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700")
# Enable warnings above the default level, but don't treat them as errors:
# - C4115: named type definition in parentheses
Author: aandrejevic
Date: Mon Apr 21 01:51:27 2014
New Revision: 62850
URL: http://svn.reactos.org/svn/reactos?rev=62850&view=rev
Log:
Fix broken merge.
Modified:
branches/ntvdm/win32ss/user/winsrv/consrv/include/conio.h
Modified: branches/ntvdm/win32ss/user/winsrv/consrv/include/conio.h
URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr…
==============================================================================
--- branches/ntvdm/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original)
+++ branches/ntvdm/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Mon Apr 21 01:51:27 2014
@@ -329,7 +329,6 @@
COORD ConsoleSize; /* The current size of the console, for text-mode only */
BOOLEAN FixedSize; /* TRUE if the console is of fixed size */
- BOOLEAN NotifyLastClose; /* TRUE if the console should send a control event when a process detaches, and only one process is still attached to it */
COLORREF Colors[16]; /* Colour palette */