Remove NOMINMAX definition to better catch Windows.h issues in the future.

Author: ras0219-msft

Release/include/pplx/pplxtasks.h

@@ -7332,4 +7332,5 @@ namespace concurrency = Concurrency;
 #endif
 
 #endif // _PPLXTASKS_H
+
 

Release/src/http/client/http_client_winhttp.cpp

@@ -21,6 +21,9 @@
 #include <VersionHelpers.h>
 #endif
 
+#undef min
+#undef max
+
 namespace web
 {
 namespace http
@@ -1527,3 +1530,4 @@ std::shared_ptr<_http_client_communicator> create_platform_final_pipeline_stage(
 }
 
 }}}}
+

Release/src/http/common/http_msg.cpp

@@ -13,6 +13,9 @@
 #include "stdafx.h"
 #include "../common/internal_http_helpers.h"
 
+#undef min
+#undef max
+
 using namespace web;
 using namespace utility;
 using namespace concurrency;
@@ -1043,3 +1046,4 @@ details::_http_request::_http_request(std::unique_ptr<http::details::_http_serve
 #undef DAT
 #endif
 }} // namespace web::http
+

Release/src/http/listener/http_server_httpsys.cpp

@@ -22,6 +22,9 @@
 #include "http_server_httpsys.h"
 #include "http_server_impl.h"
 
+#undef min
+#undef max
+
 using namespace web;
 using namespace utility;
 using namespace concurrency;
@@ -1054,4 +1057,4 @@ std::unique_ptr<http_server> make_http_httpsys_server()
 
 }}}}
 
-#endif
+#endif

Release/src/json/json.cpp

@@ -13,6 +13,9 @@
 
 #include "stdafx.h"
 
+#undef min
+#undef max
+
 using namespace web;
 
 bool json::details::g_keep_json_object_unsorted = false;
@@ -516,3 +519,4 @@ const web::json::details::json_error_category_impl& web::json::details::json_err
 #endif
     return instance;
 }
+

Release/src/pch/stdafx.h

@@ -19,9 +19,6 @@
 #pragma clang diagnostic ignored "-Winfinite-recursion"
 #endif
 
-#include "cpprest/details/cpprest_compat.h"
-#include "cpprest/details/basic_types.h"
-
 #ifdef _WIN32
 #ifdef CPPREST_TARGET_XP
 #include <winsdkver.h>
@@ -37,12 +34,7 @@
     #include <crtdbg.h>
 #endif
 
-#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#define NOMINMAX
-#endif
-
 #include <windows.h>
 #include <objbase.h>
 
@@ -96,6 +88,9 @@
 #include <thread>
 #include <set>
 
+#include "cpprest/details/cpprest_compat.h"
+#include "cpprest/details/basic_types.h"
+
 #include "pplx/pplxtasks.h"
 #include "cpprest/version.h"
 
@@ -140,13 +135,6 @@
 #endif // _WIN32_WINNT >= _WIN32_WINNT_VISTA
 #endif
 
-#if defined(max)
-#error: max macro defined -- make sure to #define NOMINMAX before including windows.h
-#endif
-#if defined(min)
-#error: min macro defined -- make sure to #define NOMINMAX before including windows.h
-#endif
-
 #if defined(__clang__)
 #pragma clang diagnostic pop
-#endif
+#endif

Release/src/websockets/client/ws_client_wspp.cpp

@@ -20,6 +20,10 @@
 
 #include "ws_client_impl.h"
 
+// These must be undef'ed before including websocketpp because it is not Windows.h safe.
+#undef min
+#undef max
+
 // Force websocketpp to use C++ std::error_code instead of Boost.
 #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
 #if defined(_MSC_VER)
@@ -792,3 +796,4 @@ websocket_callback_client::websocket_callback_client(websocket_client_config con
 }}}
 
 #endif
+

Release/tests/common/utilities/os_utilities.cpp

@@ -15,7 +15,6 @@
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-#define NOMINMAX
 #include <Windows.h>
 #else
 #include <unistd.h>
@@ -55,3 +54,4 @@ long os_utilities::interlocked_exchange(volatile long *target, long value)
 }
 
 }}}
+