From: Amos Jeffries Date: Fri, 18 Apr 2008 05:20:48 +0000 (-0600) Subject: Author: Guido Serassio X-Git-Tag: SQUID_3_0_STABLE5~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82263cfc21a2c3d127d643bc350b727a87475065;p=thirdparty%2Fsquid.git Author: Guido Serassio Fix build error on Irix. On Irix the inclusion of sstream defines assert(), so the build fails for a redefinition error. Just include Debug.h as last to fix the problem. AYJ: amendment patch included: Troublesome header include was a duplicate of a better sequence in Debug.h remove the .cc duplicates. --- diff --git a/src/debug.cc b/src/debug.cc old mode 100644 new mode 100755 index 5d7fbbc731..dc60cfc93d --- a/src/debug.cc +++ b/src/debug.cc @@ -35,7 +35,6 @@ #include "squid.h" #include "Debug.h" #include "SquidTime.h" -#include int Debug::Levels[MAX_DEBUG_SECTIONS]; int Debug::level;