From 903291f88ac8d4d3042337d27f89bb4317e6b8ce Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 29 Jan 2020 13:43:49 +0100
Subject: [PATCH] defrag: fix use of globals

---
 src/defrag-hash.c |  7 +++++++
 src/defrag-hash.h | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/defrag-hash.c b/src/defrag-hash.c
index bec87f9d39..6eee4ea961 100644
--- a/src/defrag-hash.c
+++ b/src/defrag-hash.c
@@ -25,6 +25,13 @@
 #include "util-misc.h"
 #include "util-hash-lookup3.h"
 
+/** defrag tracker hash table */
+DefragTrackerHashRow *defragtracker_hash;
+DefragConfig defrag_config;
+SC_ATOMIC_DECLARE(uint64_t,defrag_memuse);
+SC_ATOMIC_DECLARE(unsigned int,defragtracker_counter);
+SC_ATOMIC_DECLARE(unsigned int,defragtracker_prune_idx);
+
 static DefragTracker *DefragTrackerGetUsedDefragTracker(void);
 
 /** queue with spare tracker */
diff --git a/src/defrag-hash.h b/src/defrag-hash.h
index f64208bfae..2716a6c901 100644
--- a/src/defrag-hash.h
+++ b/src/defrag-hash.h
@@ -62,7 +62,7 @@ typedef struct DefragTrackerHashRow_ {
 } DefragTrackerHashRow;
 
 /** defrag tracker hash table */
-DefragTrackerHashRow *defragtracker_hash;
+extern DefragTrackerHashRow *defragtracker_hash;
 
 #define DEFRAG_VERBOSE    0
 #define DEFRAG_QUIET      1
@@ -84,10 +84,10 @@ typedef struct DefragConfig_ {
 #define DEFRAG_CHECK_MEMCAP(size) \
     ((((uint64_t)SC_ATOMIC_GET(defrag_memuse) + (uint64_t)(size)) <= SC_ATOMIC_GET(defrag_config.memcap)))
 
-DefragConfig defrag_config;
-SC_ATOMIC_DECLARE(uint64_t,defrag_memuse);
-SC_ATOMIC_DECLARE(unsigned int,defragtracker_counter);
-SC_ATOMIC_DECLARE(unsigned int,defragtracker_prune_idx);
+extern DefragConfig defrag_config;
+SC_ATOMIC_EXTERN(uint64_t,defrag_memuse);
+SC_ATOMIC_EXTERN(unsigned int,defragtracker_counter);
+SC_ATOMIC_EXTERN(unsigned int,defragtracker_prune_idx);
 
 void DefragInitConfig(char quiet);
 void DefragHashShutdown(void);