From dcdf2375ec38bfcd53d6e40f97ef5cb26d9bcfd0 Mon Sep 17 00:00:00 2001
From: Marcel Raad <raad@teamviewer.com>
Date: Sun, 28 May 2017 13:56:34 +0200
Subject: [PATCH] Win32: protect against min/max macros

Defining NOMINMAX doesn't help if windows.h gets included before api.hpp.
Use BOOST_PREVENT_MACRO_SUBSTITUTION from config instead.
This fixes compilation with BOOST_USE_WINDOWS_H defined,
which is required for compiling with clang on Windows.
---
 src/win32/api.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/win32/api.hpp b/src/win32/api.hpp
index a41fbde..35c3813 100644
--- a/src/win32/api.hpp
+++ b/src/win32/api.hpp
@@ -25,6 +25,7 @@
 #endif
 #include <windows.h>
 
+#include <boost/config.hpp>
 #include <boost/locale/conversion.hpp>
 #include <boost/locale/collator.hpp>
 
@@ -134,10 +135,10 @@ namespace impl_win {
         }
         if(!inf_group) {
             if(std::numeric_limits<char>::is_signed) {
-                res.grouping+=std::numeric_limits<char>::min();
+                res.grouping+=std::numeric_limits<char>::min BOOST_PREVENT_MACRO_SUBSTITUTION();
             }
             else {
-                res.grouping+=std::numeric_limits<char>::max();
+                res.grouping+=std::numeric_limits<char>::max BOOST_PREVENT_MACRO_SUBSTITUTION();
             }
         }
         return res;