From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Dec 2010 13:14:30 +0000 (-0700)
Subject: FreeBSD: fix oid definition clash.
X-Git-Tag: take1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56153bff86f9fc5ceff7fe4f5f9b28f4bc8c3016;p=thirdparty%2Fsquid.git

FreeBSD: fix oid definition clash.

Use config.h insted of squid.h in peer_proxy_negotiate_auth.cc to avoid
"oid" type clash between the krb5/gssapi library API and SNMP libray APIs
---

diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc
index 863c8bd493..1d5ada7acd 100644
--- a/src/peer_proxy_negotiate_auth.cc
+++ b/src/peer_proxy_negotiate_auth.cc
@@ -25,8 +25,9 @@
  * Hosted at http://sourceforge.net/projects/squidkerbauth
  */
 
-#include "squid.h"
+#include "config.h"
 #include "base64.h"
+#include "Debug.h"
 
 #if HAVE_KRB5 && HAVE_GSSAPI
 #ifdef __cplusplus