From: hno <>
Date: Thu, 11 May 2006 03:03:04 +0000 (+0000)
Subject: Take 2 of the FD_SETSIZE redefined fix.. eleminate the need of squid.h
X-Git-Tag: SQUID_3_0_PRE4~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca44996e95293a0221e878f0a4878a74af4709a;p=thirdparty%2Fsquid.git

Take 2 of the FD_SETSIZE redefined fix.. eleminate the need of squid.h
completely (was only needed for definition of NULL which isn't needed in C++)
---

diff --git a/src/HttpRequestMethod.h b/src/HttpRequestMethod.h
index fd5b6741d7..9bb04ac7ba 100644
--- a/src/HttpRequestMethod.h
+++ b/src/HttpRequestMethod.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequestMethod.h,v 1.2 2006/05/10 20:39:35 hno Exp $
+ * $Id: HttpRequestMethod.h,v 1.3 2006/05/10 21:03:04 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -34,9 +34,6 @@
 #ifndef SQUID_HTTPREQUESTMETHOD_H
 #define SQUID_HTTPREQUESTMETHOD_H
 
-/* For the definition of NULL. Needs to go before any other includes */
-#include "squid.h"
-
 #include <iosfwd>
 
 enum _method_t {
@@ -115,7 +112,7 @@ public:
 
     HttpRequestMethod(method_t const aMethod) : theMethod(aMethod) {}
 
-    HttpRequestMethod(char const * begin, char const * end=NULL);
+    HttpRequestMethod(char const * begin, char const * end=0);
 
     operator method_t() const {return theMethod; }