kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define NOMINMAX across the entire project.

Browse Source 
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:
David Benjamin 2015-04-02 13:20:01 -04:00 committed by Adam Langley
parent c0f763b080
commit 0e434b9470
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -63,6 +63,7 @@ elseif(MSVC)
set(CMAKE_CXX_FLAGS "-Wall -WX ${MSVC_DISABLED_WARNINGS_STR}") set(CMAKE_CXX_FLAGS "-Wall -WX ${MSVC_DISABLED_WARNINGS_STR}")
add_definitions(-D_HAS_EXCEPTIONS=0) add_definitions(-D_HAS_EXCEPTIONS=0)
add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-DWIN32_LEAN_AND_MEAN)
add_definitions(-DNOMINMAX)
endif() endif()
if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.7.99") OR if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.7.99") OR

1
tool/digest.cc
View File

@ -32,7 +32,6 @@
#define O_BINARY 0 #define O_BINARY 0
#endif #endif
#else #else
#define NOMINMAX
#pragma warning(push, 3) #pragma warning(push, 3)
#include <windows.h> #include <windows.h>
#pragma warning(pop) #pragma warning(pop)

1
tool/transport_common.cc
View File

@ -31,7 +31,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#else #else
#define NOMINMAX
#include <io.h> #include <io.h>
#pragma warning(push, 3) #pragma warning(push, 3)
#include <winsock2.h> #include <winsock2.h>