aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorLuca Deri <deri@ntop.org>2018-09-29 08:28:26 +0200
committerLuca Deri <deri@ntop.org>2018-09-29 08:28:26 +0200
commit1f24adc9cd90f05a463a71e7c2d14c1863ccba00 (patch)
treeb2d92f85d5df558c65a4b8e6610892136610b7b6 /src/lib
parentf639c237a19cb79c39af1fc552e336d504af0bad (diff)
Renamed source files to avoid clashes
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ndpi_main.c2
-rw-r--r--src/lib/third_party/include/ht_hash.h (renamed from src/lib/third_party/include/hash.h)0
-rw-r--r--src/lib/third_party/src/ht_hash.c (renamed from src/lib/third_party/src/hash.c)2
3 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 2c546d47d..a199ebcd0 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -43,7 +43,7 @@
#include "ndpi_content_match.c.inc"
#include "third_party/include/ndpi_patricia.h"
-#include "third_party/include/hash.h"
+#include "third_party/include/ht_hash.h"
#define NDPI_CONST_GENERIC_PROTOCOL_NAME "GenericProtocol"
diff --git a/src/lib/third_party/include/hash.h b/src/lib/third_party/include/ht_hash.h
index 2251706e4..2251706e4 100644
--- a/src/lib/third_party/include/hash.h
+++ b/src/lib/third_party/include/ht_hash.h
diff --git a/src/lib/third_party/src/hash.c b/src/lib/third_party/src/ht_hash.c
index 61ba9fbf6..4eaac9bcb 100644
--- a/src/lib/third_party/src/hash.c
+++ b/src/lib/third_party/src/ht_hash.c
@@ -7,7 +7,7 @@
#include <limits.h>
#include <string.h>
-#include "hash.h"
+#include "ht_hash.h"
/* #define HASH_DEBUG 1 */