aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni <matzeton@googlemail.com>2023-10-16 19:49:50 +0200
committerGitHub <noreply@github.com>2023-10-16 19:49:50 +0200
commit32b0aeea59dd5a7425b28ae50fd890ae852a0a97 (patch)
treefc07c2bb5f3f70992310b070ebce069904004f38
parentd75a8d339a8d88742081084bc7ab98524d1dd622 (diff)
Fixed OpenWRT arm related build issues. (#2104)
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r--src/include/ndpi_define.h.in5
-rw-r--r--src/lib/third_party/src/roaring.c1
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in
index c22d69823..4d61d7130 100644
--- a/src/include/ndpi_define.h.in
+++ b/src/include/ndpi_define.h.in
@@ -310,9 +310,10 @@
#define get_u_int16_t(X,O) (*(u_int16_t *)((&(((u_int8_t *)X)[O]))))
#define get_u_int32_t(X,O) (*(u_int32_t *)((&(((u_int8_t *)X)[O]))))
#if defined(__arm__)
-static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O)
+#include <stdint.h>
+static inline uint64_t get_u_int64_t(const uint8_t* X, int O)
{
- u_int64_t tmp;
+ uint64_t tmp;
memcpy(&tmp, X + O, sizeof(tmp));
return tmp;
}
diff --git a/src/lib/third_party/src/roaring.c b/src/lib/third_party/src/roaring.c
index 537cb7db6..fd382ed00 100644
--- a/src/lib/third_party/src/roaring.c
+++ b/src/lib/third_party/src/roaring.c
@@ -4298,7 +4298,6 @@ int run_run_container_ixor(
#ifndef WIN32
#include "ndpi_config.h"
-#include "ndpi_typedefs.h"
#define NDPI_REPLACE_FPRINTF
#include "../../ndpi_replace_printf.h"