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 9bae0d6d20542ee0d8c16bed77e844634cedab01..259914d6340ffbf0d81e1bfaf729e47d702ce588 100644 (file)
--- a/src/Parsing.h
+++ b/src/Parsing.h
@@ -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,7 +54,7 @@ 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);