location: Move private declaration away from header

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/detect-location.c b/src/detect-location.c
index 0d212581dc10586d1f9c05685738c5ff321c4c8a..1556d7cd601310a0fc5a9829ca05219b75406ef9 100644 (file)
--- a/src/detect-location.c
+++ b/src/detect-location.c
@@ -38,6 +38,20 @@
 #include <libloc/database.h>
 #include <libloc/network.h>
 
+enum location_flags {
+    LOCATION_FLAG_SRC     = (1 << 0),
+    LOCATION_FLAG_DST     = (1 << 1),
+    LOCATION_FLAG_BOTH    = (1 << 2),
+    LOCATION_FLAG_NEGATED = (1 << 3),
+};
+
+struct DetectLocationData {
+    struct loc_ctx* ctx;
+    struct loc_database* db;
+    char** countries;
+    int flags;
+};
+
 /**
  * \brief This function will free all resources used by the location module
  *

diff --git a/src/detect-location.h b/src/detect-location.h
index 8d82573f3452678857d823fa432ef36d409a529c..682e9afd9b2de07e8d78ddecdd9e6d3a383e97c7 100644 (file)
--- a/src/detect-location.h
+++ b/src/detect-location.h
@@ -26,27 +26,6 @@
 #ifndef __DETECT_LOCATION_H__
 #define __DETECT_LOCATION_H__
 
-#ifdef HAVE_LIBLOC
-
-#include <libloc/libloc.h>
-#include <libloc/database.h>
-
-enum location_flags {
-    LOCATION_FLAG_SRC     = (1 << 0),
-    LOCATION_FLAG_DST     = (1 << 1),
-    LOCATION_FLAG_BOTH    = (1 << 2),
-    LOCATION_FLAG_NEGATED = (1 << 3),
-};
-
-struct DetectLocationData {
-    struct loc_ctx* ctx;
-    struct loc_database* db;
-    char** countries;
-    int flags;
-};
-
-#endif /* HAVE_LIBLOC */
-
 void DetectLocationRegister(void);
 
 #endif /* __DETECT_LOCATION_H__ */