From 1f24adc9cd90f05a463a71e7c2d14c1863ccba00 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Sat, 29 Sep 2018 08:28:26 +0200 Subject: [PATCH] Renamed source files to avoid clashes --- src/lib/ndpi_main.c | 2 +- src/lib/third_party/include/{hash.h => ht_hash.h} | 0 src/lib/third_party/src/{hash.c => ht_hash.c} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/lib/third_party/include/{hash.h => ht_hash.h} (100%) rename src/lib/third_party/src/{hash.c => ht_hash.c} (99%) 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 similarity index 100% rename from src/lib/third_party/include/hash.h rename to 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 similarity index 99% rename from src/lib/third_party/src/hash.c rename to 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 #include -#include "hash.h" +#include "ht_hash.h" /* #define HASH_DEBUG 1 */