aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuca Deri <deri@ntop.org>2021-06-08 18:15:12 +0200
committerLuca Deri <deri@ntop.org>2021-06-08 18:15:46 +0200
commit177f9456bd2667b2efaa47f4fd381f756cc55092 (patch)
tree16c4e571e8fdd04aa86d44ba318c6ae0b8b4d7a6 /src
parentd3aa3df97520fb6a00a05cd54aedc8efc35fdeff (diff)
Win changes
Diffstat (limited to 'src')
-rw-r--r--src/lib/ndpi_main.c3
-rw-r--r--src/lib/third_party/include/ahocorasick.h4
-rw-r--r--src/lib/third_party/src/ahocorasick.c6
3 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 8220ea71e..2652917e3 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -6557,7 +6557,8 @@ void ndpi_dump_risks_score() {
for(i = 1; i < NDPI_MAX_RISK; i++) {
ndpi_risk_enum r = (ndpi_risk_enum)i;
ndpi_risk risk = 2 << (r-1);
- ndpi_risk_severity s = ndpi_risk2severity(r)->severity;
+ ndpi_risk_info* info = ndpi_risk2severity(r);
+ ndpi_risk_severity s =info->severity;
u_int16_t client_score, server_score;
u_int16_t score = ndpi_risk2score(risk, &client_score, &server_score);
diff --git a/src/lib/third_party/include/ahocorasick.h b/src/lib/third_party/include/ahocorasick.h
index 551a922f9..71fc22d0d 100644
--- a/src/lib/third_party/include/ahocorasick.h
+++ b/src/lib/third_party/include/ahocorasick.h
@@ -184,10 +184,6 @@ typedef struct ac_node
AC_ALPHABET_t *a_ptr;
} AC_NODE_t;
-#ifndef __SIZEOF_POINTER__
-#error SIZEOF_POINTER not defined!
-#endif
-
struct edge {
unsigned short degree; /* Number of outgoing edges */
unsigned short max; /* Max capacity of allocated memory for outgoing */
diff --git a/src/lib/third_party/src/ahocorasick.c b/src/lib/third_party/src/ahocorasick.c
index 8e36d7fdb..034a932d3 100644
--- a/src/lib/third_party/src/ahocorasick.c
+++ b/src/lib/third_party/src/ahocorasick.c
@@ -24,7 +24,11 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#ifndef WIN32
#include <unistd.h>
+#else
+#define __SIZEOF_LONG__ 4
+#endif
#include <stdint.h>
#include <sys/types.h>
#else
@@ -756,7 +760,7 @@ static inline size_t bsf(uint32_t bits)
#else
size_t i=0;
if(!bits) return i;
- if((bits & 0xffff)bits == 0) { i+=16; bits >>=16; }
+ if((bits & 0xffff) == 0) { i+=16; bits >>=16; }
if((bits & 0xff) == 0) i+=8;
return i;
#endif