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

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

diff --git a/src/Parsing.h b/src/Parsing.h
index 91f444988e42aad046407eb1025859d728d40986..259914d6340ffbf0d81e1bfaf729e47d702ce588 100644 (file)
--- a/src/Parsing.h
+++ b/src/Parsing.h
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * DEBUG: section 3     Configuration File Parsing
+ * DEBUG: section 03    Configuration File Parsing
  * AUTHOR: Harvest Derived
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -36,7 +36,7 @@
 #ifndef SQUID_PARSING_H
 #define SQUID_PARSING_H
 
-#include "squid.h"
+#include "squid-old.h"
 
 extern double xatof(const char *token);
 extern int xatoi(const char *token);
@@ -54,18 +54,18 @@ extern int64_t GetInteger64(void);
  */
 extern int GetInteger(void);
 
-extern u_short GetShort(void);
+extern unsigned short GetShort(void);
 
 // on success, returns true and sets *p (if any) to the end of the integer
 extern bool StringToInt(const char *str, int &result, const char **p, int base);
 extern bool StringToInt64(const char *str, int64_t &result, const char **p, int base);
 
 /**
- * Parse a socket address (host:port), fill the given IpAddress object
+ * Parse a socket address (host:port), fill the given Ip::Address object
  * \retval false     Failure.
  * \retval true      Success.
  * Destroys token during parse.
  */
-extern bool GetHostWithPort(char *token, IpAddress *ipa);
+extern bool GetHostWithPort(char *token, Ip::Address *ipa);
 
 #endif /* SQUID_PARSING_H */