Fixing up macro check for websocket enablement.

Author: stgates

Release/include/cpprest/details/basic_types.h

@@ -30,6 +30,7 @@
 #include <iostream>
 #include <sstream>
 #include "cpprest/details/cpprest_compat.h"
+#include "cpprest/details/basic_types.h"
 
 #ifndef _WIN32
 # define __STDC_LIMIT_MACROS
@@ -122,3 +123,19 @@ typedef std::basic_ostream<utf16char> utf16ostream;
 typedef std::basic_istream<utf16char> utf16istream;
 typedef std::basic_istringstream<utf16char> utf16istringstream;
 #endif
+
+
+#if defined(_WIN32)
+// Include on everything except Windows Desktop ARM, unless explicitly excluded.
+#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
+#if defined(WINAPI_FAMILY)
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && defined(_M_ARM)
+#define CPPREST_EXCLUDE_WEBSOCKETS
+#endif
+#else
+#if defined(_M_ARM)
+#define CPPREST_EXCLUDE_WEBSOCKETS
+#endif
+#endif
+#endif
+#endif

Release/include/cpprest/details/cpprest_compat.h

@@ -36,12 +36,7 @@
 
 #define CASABLANCA_UNREFERENCED_PARAMETER(x) (x)
 
-#if _MSC_VER >= 1700
-// Support VS2012 SAL syntax only
 #include <sal.h>
-#else
-#include "cpprest/details/nosal.h"
-#endif
 
 #else // End settings specific to Windows
 

Release/include/cpprest/ws_client.h

@@ -25,8 +25,9 @@
 #ifndef _CASA_WS_CLIENT_H
 #define _CASA_WS_CLIENT_H
 
-// Include on everything except Windows Desktop ARM, unless explicitly excluded.
-#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
+#include "cpprest/details/basic_types.h"
+
+#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 #include <memory>
 #include <limits>
@@ -37,7 +38,6 @@
 #include "cpprest/uri.h"
 #include "cpprest/details/web_utilities.h"
 #include "cpprest/http_headers.h"
-#include "cpprest/details/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 #include "cpprest/ws_msg.h"
 

Release/include/cpprest/ws_msg.h

@@ -22,8 +22,9 @@
 ****/
 #pragma once
 
-// Include on everything except Windows Desktop ARM, unless explicitly excluded.
-#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
+#include "cpprest/details/basic_types.h"
+
+#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 #include <memory>
 #include <limits>
@@ -32,7 +33,6 @@
 #include "cpprest/streams.h"
 #include "cpprest/containerstream.h"
 #include "cpprest/uri.h"
-#include "cpprest/details/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 
 namespace web

Release/src/websockets/client/ws_client.cpp

@@ -22,8 +22,7 @@
 ****/
 #include "stdafx.h"
 
-// Include on everything except Windows Desktop ARM, unless explicitly excluded.
-#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
+#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 namespace web
 {

Release/src/websockets/client/ws_client_wspp.cpp

@@ -26,8 +26,7 @@
 #include "stdafx.h"
 #include "cpprest/details/x509_cert_utilities.h"
 
-// Include on everything except Windows Desktop ARM, unless explicitly excluded.
-#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
+#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 // Force websocketpp to use C++ std::error_code instead of Boost.
 #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_

Release/src/websockets/client/ws_msg.cpp

@@ -26,8 +26,7 @@
 ****/
 #include "stdafx.h"
 
-// Include on everything except Windows Desktop ARM, unless explicitly excluded.
-#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
+#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
 
 using namespace concurrency;
 using namespace concurrency::streams::details;