From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 9 Dec 2015 22:55:35 +0000 (-0500)
Subject: Merge pull request #178 in SNORT/snort3 from ~JOCORNET/snort3:memory_profiler_visibil... 
X-Git-Tag: 3.0.0-233~688
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a80e90a34db23d0d2cb2d43a542becb4466d9600;p=thirdparty%2Fsnort3.git

Merge pull request #178 in SNORT/snort3 from ~JOCORNET/snort3:memory_profiler_visibility_quickfix to master

Squashed commit of the following:

commit 0ccc0460560dc704aea117de3cdfead8e2f38ed2
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Wed Dec 9 16:25:25 2015 -0500

    added SO_PUBLIC prefix to MemoryContext & MemoryExclude
---

diff --git a/src/profiler/memory_profiler_defs.h b/src/profiler/memory_profiler_defs.h
index b04d2b0a2..9a3d1daf1 100644
--- a/src/profiler/memory_profiler_defs.h
+++ b/src/profiler/memory_profiler_defs.h
@@ -21,6 +21,8 @@
 #ifndef MEMORY_PROFILER_DEFS_H
 #define MEMORY_PROFILER_DEFS_H
 
+#include "main/snort_types.h"
+
 struct MemoryTracker;
 
 struct MemoryProfilerConfig
@@ -37,7 +39,7 @@ struct MemoryProfilerConfig
     unsigned count = 0;
 };
 
-class MemoryContext
+class SO_PUBLIC MemoryContext
 {
 public:
     MemoryContext(MemoryTracker&);
@@ -50,7 +52,7 @@ private:
     MemoryTracker* saved;
 };
 
-class MemoryExclude
+class SO_PUBLIC MemoryExclude
 {
 public:
     MemoryExclude();