From: robertc <> Date: Sat, 26 Apr 2003 03:45:29 +0000 (+0000) Subject: Summary: Bugfix min redeclaration. X-Git-Tag: SQUID_3_0_PRE1~234 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ba05137debee322c7daca4b79fe6cab365394ac;p=thirdparty%2Fsquid.git Summary: Bugfix min redeclaration. Keywords: #ifndef min was in the wrong place. --- diff --git a/src/squid.h b/src/squid.h index cb668974ff..ef64d529e5 100644 --- a/src/squid.h +++ b/src/squid.h @@ -1,6 +1,6 @@ /* - * $Id: squid.h,v 1.234 2003/04/24 06:35:09 hno Exp $ + * $Id: squid.h,v 1.235 2003/04/25 21:45:29 robertc Exp $ * * AUTHOR: Duane Wessels * @@ -366,9 +366,10 @@ extern "C" #include "snprintf.h" #endif +#ifndef min + template inline A const & -#ifndef min min(A const & lhs, A const & rhs) { if (rhs < lhs)