From: François Revol Date: Fri, 8 Jul 2022 23:23:29 +0000 (+0200) Subject: Avoid redeclaring uint8 & friends on Haiku X-Git-Tag: libpcap-1.10.2~117 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/155f55f5e2a25545799b28025429514f4cba6c6c?ds=inline Avoid redeclaring uint8 & friends on Haiku Haiku declares and uses them for itself but in a different way. (cherry picked from commit c58497773116be47da8423725b989380630773d8) --- diff --git a/rpcap-protocol.h b/rpcap-protocol.h index a69cf802..88d5133a 100644 --- a/rpcap-protocol.h +++ b/rpcap-protocol.h @@ -132,10 +132,12 @@ * XXX - use the C99 types? Microsoft's newer versions of Visual Studio * support them. */ +#ifndef __HAIKU__ typedef unsigned char uint8; /* 8-bit unsigned integer */ typedef unsigned short uint16; /* 16-bit unsigned integer */ typedef unsigned int uint32; /* 32-bit unsigned integer */ typedef int int32; /* 32-bit signed integer */ +#endif /* Common header for all the RPCAP messages */ struct rpcap_header