]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Workaround com_err.h C++ brokenness triggered by OpenSSL includes
authorHenrik Nordstrom <henrik@henriknordstrom.net>
Wed, 16 Sep 2009 00:24:35 +0000 (02:24 +0200)
committerHenrik Nordstrom <henrik@henriknordstrom.net>
Wed, 16 Sep 2009 00:24:35 +0000 (02:24 +0200)
compat/compat_shared.h

index 9431ea46d19c5e75c038ca164a70186878de3d2e..4abc979b97be4d8c5f24994ea733b18bc9d754d3 100644 (file)
@@ -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 */