From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 25 May 2013 09:02:59 +0000 (-0600)
Subject: Windows: include 'functional' before defining stdlib API wrapper functions
X-Git-Tag: SQUID_3_4_0_1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a27592a2ced18486a02957bcd6964f649d20f3ac;p=thirdparty%2Fsquid.git

Windows: include 'functional' before defining stdlib API wrapper functions

We currently use of #define to replace functions in the stdlib API with
versions which use the Windows API and error reporting.
Some of these result in precompiler replacement of systen internal
symbols. In this case member functions called bind() in templates of
<functional> API get replaced by Squid::bind() symbol.
---

diff --git a/compat/os/mswindows.h b/compat/os/mswindows.h
index af247c6070..b1932c81da 100644
--- a/compat/os/mswindows.h
+++ b/compat/os/mswindows.h
@@ -461,6 +461,9 @@ index(const char *s, int c)
     return (char *)strchr(s,c);
 }
 
+// stdlib <functional> definitions are required before std API redefinitions.
+#include <functional>
+
 /** \cond AUTODOCS-IGNORE */
 namespace Squid
 {