From d2039386b0c59d17e70b64b6e1abad415d334a0f Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Fri, 31 Oct 2014 23:34:01 +0100 Subject: [PATCH] Add includes and use min/max to get them into global scope --- depends/md5/md5wrapper.cpp | 1 + depends/protobuf/google/protobuf/stubs/common.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/depends/md5/md5wrapper.cpp b/depends/md5/md5wrapper.cpp index d9f857c5d..7feb25035 100644 --- a/depends/md5/md5wrapper.cpp +++ b/depends/md5/md5wrapper.cpp @@ -22,6 +22,7 @@ //---------------------------------------------------------------------- //basic includes +#include #include #include #include diff --git a/depends/protobuf/google/protobuf/stubs/common.h b/depends/protobuf/google/protobuf/stubs/common.h index 60187f28b..9cd2b9e9a 100644 --- a/depends/protobuf/google/protobuf/stubs/common.h +++ b/depends/protobuf/google/protobuf/stubs/common.h @@ -47,6 +47,10 @@ #elif !defined(_MSC_VER) #include #endif +#include + +using std::min; +using std::max; // make MSVC shut up about some things #ifdef _MSC_VER