From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Sat, 23 Nov 2019 02:17:48 +0000 (+0000)
Subject: Merge pull request #1862 in SNORT/snort3 from ~JIAWU2/snort3:dynamic_fix to master
X-Git-Tag: 3.0.0-265~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24792fb5c9fb6b3fff8f215df2a52177e2dc5c24;p=thirdparty%2Fsnort3.git

Merge pull request #1862 in SNORT/snort3 from ~JIAWU2/snort3:dynamic_fix to master

Squashed commit of the following:

commit d4338ff7993f3d75898004cf6ac24104ee35b1e3
Author: Jian Wu <jiawu2@cisco.com>
Date:   Fri Nov 22 16:22:53 2019 -0500

    pub_sub: fix warning when loading cip as dynamic lib
---

diff --git a/src/pub_sub/cip_events.h b/src/pub_sub/cip_events.h
index 804020f81..36b65a5d0 100644
--- a/src/pub_sub/cip_events.h
+++ b/src/pub_sub/cip_events.h
@@ -42,7 +42,7 @@ struct SfIp;
 
 struct CipEventData;
 
-class CipEvent : public snort::DataEvent
+class SO_PUBLIC CipEvent : public snort::DataEvent
 {
 public:
     CipEvent(const snort::Packet*, const CipEventData*);