Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / NullDelayId.h

diff --git a/src/NullDelayId.h b/src/NullDelayId.h
index b965580d5975b593caddf7dde010ba8d4ab22cbc..c66f3ce7e1f258e3dae34c35e065773c88afd8da 100644 (file)
--- a/src/NullDelayId.h
+++ b/src/NullDelayId.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: NullDelayId.h,v 1.1 2003/02/05 10:36:48 robertc Exp $
+ * $Id$
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -23,12 +23,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -36,22 +36,21 @@
  *
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
-
-#include "config.h"
-
 #ifndef NULLDELAYID_H
 #define NULLDELAYID_H
-#if DELAY_POOLS
-#include "squid.h"
+#if USE_DELAY_POOLS
+#include "squid-old.h"
 #include "RefCount.h"
 #include "DelayIdComposite.h"
 
-class NullDelayId : public DelayIdComposite {
-  public:
+class NullDelayId : public DelayIdComposite
+{
+
+public:
     void *operator new(size_t);
     void operator delete (void *);
-    virtual void deleteSelf() const;
-    virtual int bytesWanted (int min, int max) const {return XMAX(min,max);}
+    virtual int bytesWanted (int minimum, int maximum) const {return max(minimum,maximum);}
+
     virtual void bytesIn(int qty) {}
 };
 #endif