From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 21 Sep 2016 10:54:09 +0000 (-0400)
Subject: Merge pull request #629 in SNORT/snort3 from ~MIALTIZE/snort3:freebsd-fix to master
X-Git-Tag: 3.0.0-233~263^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d3c920d7a38581ce32f3adcb4363308d2def711;p=thirdparty%2Fsnort3.git

Merge pull request #629 in SNORT/snort3 from ~MIALTIZE/snort3:freebsd-fix to master

Squashed commit of the following:

commit f14956bfe743fb068fbdc6298952b3dae85927eb
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Sep 21 00:14:24 2016 -0400

    service_rpc: Fix FreeBSD build
---

diff --git a/src/network_inspectors/appid/service_plugins/service_rpc.cc b/src/network_inspectors/appid/service_plugins/service_rpc.cc
index b09249029..310bc0eca 100644
--- a/src/network_inspectors/appid/service_plugins/service_rpc.cc
+++ b/src/network_inspectors/appid/service_plugins/service_rpc.cc
@@ -21,10 +21,14 @@
 
 #include "service_rpc.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <netdb.h>
 
 #if defined(FREEBSD) || defined(OPENBSD)
-#include "rpc/rpc.h"
+#include <rpc/rpc.h>
 #endif
 
 #include "service_api.h"