From b092339cd82f28986dda3d6063375f4fe3073d3f Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Wed, 16 Sep 2009 02:24:35 +0200 Subject: [PATCH] Workaround com_err.h C++ brokenness triggered by OpenSSL includes --- compat/compat_shared.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/compat/compat_shared.h b/compat/compat_shared.h index 9431ea46d1..4abc979b97 100644 --- a/compat/compat_shared.h +++ b/compat/compat_shared.h @@ -210,4 +210,20 @@ max(A const & lhs, A const & rhs) #endif +/** + * com_err.h is a C header and needs excplicit shielding, but not + * all other system headers including this care to do this. + */ +#ifdef __cplusplus +#if HAVE_ET_COM_ERR_H +extern "C" { +#include +} +#elif HAVE_COM_ERR_H +extern "C" { +#include +} +#endif +#endif + #endif /* _SQUID_COMPAT_SHARED_H */ -- 2.47.2