From caa223d2baefb3ffb0bfcec6230791e0e39ef23d Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Sat, 23 Dec 2023 09:15:42 +0100 Subject: Changes to avoid type redefinition on windows --- src/lib/third_party/include/ndpi_sha256.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/lib/third_party/include') diff --git a/src/lib/third_party/include/ndpi_sha256.h b/src/lib/third_party/include/ndpi_sha256.h index 0525f3fef..730c2b6b3 100644 --- a/src/lib/third_party/include/ndpi_sha256.h +++ b/src/lib/third_party/include/ndpi_sha256.h @@ -11,19 +11,18 @@ /*************************** HEADER FILES ***************************/ #include +#include "ndpi_typedefs.h" /****************************** MACROS ******************************/ #define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest /**************************** DATA TYPES ****************************/ -typedef unsigned char BYTE; // 8-bit byte -typedef unsigned int WORD; // 32-bit word, change to "long" for 16-bit machines typedef struct { - BYTE data[64]; - WORD datalen; + u_int8_t data[64]; + u_int32_t datalen; unsigned long long bitlen; - WORD state[8]; + u_int32_t state[8]; } SHA256_CTX; /*********************** FUNCTION DECLARATIONS **********************/ -- cgit v1.2.3