Author: tkreuzer
Date: Thu Dec 10 03:17:54 2009
New Revision: 44510
URL: http://svn.reactos.org/svn/reactos?rev=44510&view=rev
Log:
[IPHLPAPI]
Don't redefine _WIN32_WINNT to 0x500. When using the NDK we need at least 0x503 when compiling for 64 bit (XP64 is 502)
Modified:
branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/iphlpapi_private.h
Modified: branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/iphlpapi_private.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Thu Dec 10 03:17:54 2009
@@ -19,8 +19,6 @@
# include <resolv.h>
#endif
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x500
#define WIN32_NO_STATUS
#include <winsock2.h>
#include <ws2tcpip.h>
Author: tkreuzer
Date: Thu Dec 10 02:48:07 2009
New Revision: 44509
URL: http://svn.reactos.org/svn/reactos?rev=44509&view=rev
Log:
Don't C_ASSERT inside a function body. The new definition causes a warning with this.
Modified:
branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Thu Dec 10 02:48:07 2009
@@ -117,6 +117,9 @@
NULL);
}
+/* We depend on these bits being just right */
+C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC);
+
VOID
FASTCALL
KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
@@ -124,9 +127,6 @@
ULONG BitsToRemove, BitsToAdd;
LONG OldValue, NewValue;
- /* We depend on these bits being just right */
- C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC);
-
/* Increase the contention count */
GuardedMutex->Contention++;