diff options
| author | Luca Deri <deri@ntop.org> | 2020-12-17 15:34:17 +0100 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2020-12-17 15:34:17 +0100 |
| commit | b231982286757107ae3b5277a7dc268ef5b144db (patch) | |
| tree | 451edcb34c54379b7c0b3c4067dde1f603264153 | |
| parent | df1b3367a9dffa937cd2cc0de460d4394079ec6e (diff) | |
Win fixes
| -rw-r--r-- | src/include/ndpi_win32.h | 9 | ||||
| -rw-r--r-- | src/lib/ndpi_community_id.c | 2 | ||||
| -rw-r--r-- | src/lib/ndpi_utils.c | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/include/ndpi_win32.h b/src/include/ndpi_win32.h index c3403c009..b79a880e8 100644 --- a/src/include/ndpi_win32.h +++ b/src/include/ndpi_win32.h @@ -59,8 +59,10 @@ #define IPPROTO_SCTP 132 #endif +#if defined(__MINGW32__) || defined(__MINGW64__) #undef gettimeofday #define gettimeofday mingw_gettimeofday +#endif extern char* strsep(char **sp, char *sep); @@ -93,11 +95,6 @@ extern unsigned long waitForNextEvent(unsigned long ulDelay /* ms */); #define strtok_r strtok_s #define timegm _mkgmtime -static inline struct tm * localtime_r(const time_t *timep, struct tm * result) -{ - struct tm *timeinfo; - timeinfo = localtime(timep); - return timeinfo; -} +extern struct tm* localtime_r(const time_t* timep, struct tm* r); #endif /* __NDPI_WIN32_H__ */ diff --git a/src/lib/ndpi_community_id.c b/src/lib/ndpi_community_id.c index cc8436928..992d79202 100644 --- a/src/lib/ndpi_community_id.c +++ b/src/lib/ndpi_community_id.c @@ -70,7 +70,7 @@ /* **************************************************** */ -static ssize_t ndpi_community_id_buf_copy(u_int8_t * const dst, const void * const src, ssize_t len) { +static u_int16_t ndpi_community_id_buf_copy(u_int8_t * const dst, const void * const src, u_int16_t len) { if(src) memcpy(dst, src, len); else diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c index 88f4356a8..95a115110 100644 --- a/src/lib/ndpi_utils.c +++ b/src/lib/ndpi_utils.c @@ -1802,3 +1802,4 @@ u_int32_t ndpi_quick_16_byte_hash(u_int8_t *in_16_bytes_long) { return((u_int32_t)a); } +/* ******************************************************************** */ |