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 b0924902959ff8822309925d503fe55849e012a4..310bc0eca1fd4e7fc4eadb5cf075b553c6c7fac0 100644 (file)
--- 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"