From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 31 Jan 2017 13:20:31 +0000 (-0500)
Subject: Merge pull request #795 in SNORT/snort3 from units_fix to master
X-Git-Tag: 3.0.0-233~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fcd08f9e5b905c301a64880e5471c85e76cf265;p=thirdparty%2Fsnort3.git

Merge pull request #795 in SNORT/snort3 from units_fix to master

Squashed commit of the following:

commit d466d48c8cb086b7f3ceebbc55c7a00a2cea821b
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Jan 30 14:27:17 2017 -0500

    fixed #defines for classes required for unit tests
---

diff --git a/src/service_inspectors/http_inspect/http_flow_data.h b/src/service_inspectors/http_inspect/http_flow_data.h
index 1c411af03..d47b6f3f4 100644
--- a/src/service_inspectors/http_inspect/http_flow_data.h
+++ b/src/service_inspectors/http_inspect/http_flow_data.h
@@ -57,7 +57,7 @@ public:
     friend class HttpMsgBodyOld;
     friend class HttpStreamSplitter;
     friend class HttpTransaction;
-#ifdef REG_TEST
+#if defined(REG_TEST) || defined(UNIT_TEST)
     friend class HttpUnitTestSetup;
 #endif
 
diff --git a/src/service_inspectors/http_inspect/http_test_manager.h b/src/service_inspectors/http_inspect/http_test_manager.h
index 151dde238..e8729d98b 100644
--- a/src/service_inspectors/http_inspect/http_test_manager.h
+++ b/src/service_inspectors/http_inspect/http_test_manager.h
@@ -20,7 +20,7 @@
 #ifndef HTTP_TEST_MANAGER_H
 #define HTTP_TEST_MANAGER_H
 
-#ifdef REG_TEST
+#if defined(REG_TEST) || defined(UNIT_TEST)
 
 #include <sys/types.h>
 #include <stdio.h>