SourceFormat Enforcement

[thirdparty/squid.git] / src / tests / testHttpRequest.cc

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 054d5d9b413ec2d789e14988c275f12f2515ba1e..9eb0c8fa2bf5be2046f2d2edc1ac55e2b89b335c 100644 (file)
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -1,12 +1,12 @@
 #define SQUID_UNIT_TEST 1
-#include "config.h"
+#include "squid.h"
 
 #include <cppunit/TestAssert.h>
 
 #include "testHttpRequest.h"
 #include "HttpRequest.h"
 #include "Mem.h"
-
+#include "protos.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
 
@@ -33,7 +33,7 @@ void
 testHttpRequest::testCreateFromUrlAndMethod()
 {
     /* vanilla url */
-    ushort expected_port;
+    unsigned short expected_port;
     char * url = xstrdup("http://foo:90/bar");
     HttpRequest *aRequest = HttpRequest::CreateFromUrlAndMethod(url, METHOD_GET);
     expected_port = 90;
@@ -83,7 +83,7 @@ void
 testHttpRequest::testCreateFromUrl()
 {
     /* vanilla url */
-    ushort expected_port;
+    unsigned short expected_port;
     char * url = xstrdup("http://foo:90/bar");
     HttpRequest *aRequest = HttpRequest::CreateFromUrl(url);
     expected_port = 90;
@@ -102,7 +102,7 @@ testHttpRequest::testCreateFromUrl()
 void
 testHttpRequest::testIPv6HostColonBug()
 {
-    ushort expected_port;
+    unsigned short expected_port;
     char * url = NULL;
     HttpRequest *aRequest = NULL;