From fa548efb41f26da24d4ec7afc2209a5ef8a5edc1 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sat, 23 Feb 2019 16:24:21 +0100 Subject: [PATCH] [XDK] Remove _M_AMD64 special case --- modules/rostests/apitests/apphelp/register.cpp | 2 +- sdk/include/xdk/ntbasedef.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/apphelp/register.cpp b/modules/rostests/apitests/apphelp/register.cpp index fb093cc594d..146dc8cf373 100644 --- a/modules/rostests/apitests/apphelp/register.cpp +++ b/modules/rostests/apitests/apphelp/register.cpp @@ -7,7 +7,7 @@ #include #define WIN32_NO_STATUS -#include +#include #include #include #include diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 67ddadcfcf8..a40ee83e573 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -343,7 +343,7 @@ typedef void *HANDLE, **PHANDLE; typedef char CHAR; typedef short SHORT; - #if defined(__ROS_LONG64__) && !defined(_M_AMD64) + #if defined(__ROS_LONG64__) typedef int LONG; #else typedef long LONG;