From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Wed, 16 Sep 2009 00:24:35 +0000 (+0200)
Subject: Workaround com_err.h C++ brokenness triggered by OpenSSL includes
X-Git-Tag: SQUID_3_2_0_1~715
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b092339cd82f28986dda3d6063375f4fe3073d3f;p=thirdparty%2Fsquid.git

Workaround com_err.h C++ brokenness triggered by OpenSSL includes
---

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 <et/com_err.h>
+}
+#elif HAVE_COM_ERR_H
+extern "C" {
+#include <com_err.h>
+}
+#endif
+#endif
+
 #endif /* _SQUID_COMPAT_SHARED_H */