Define NOMINMAX across the entire project.
This fixes the standalone build on Windows and matches Chromium. Change-Id: I194f53e0a610c5ae9cef53c826b22f7bded5f357 Reviewed-on: https://boringssl-review.googlesource.com/4201 Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
parent
c0f763b080
commit
0e434b9470
@ -63,6 +63,7 @@ elseif(MSVC)
|
||||
set(CMAKE_CXX_FLAGS "-Wall -WX ${MSVC_DISABLED_WARNINGS_STR}")
|
||||
add_definitions(-D_HAS_EXCEPTIONS=0)
|
||||
add_definitions(-DWIN32_LEAN_AND_MEAN)
|
||||
add_definitions(-DNOMINMAX)
|
||||
endif()
|
||||
|
||||
if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.7.99") OR
|
||||
|
@ -32,7 +32,6 @@
|
||||
#define O_BINARY 0
|
||||
#endif
|
||||
#else
|
||||
#define NOMINMAX
|
||||
#pragma warning(push, 3)
|
||||
#include <windows.h>
|
||||
#pragma warning(pop)
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include <sys/socket.h>
|
||||
#include <unistd.h>
|
||||
#else
|
||||
#define NOMINMAX
|
||||
#include <io.h>
|
||||
#pragma warning(push, 3)
|
||||
#include <winsock2.h>
|
||||
|
Loading…
Reference in New Issue
Block a user