]> The Tcpdump Group git mirrors - libpcap/commitdiff
Avoid redeclaring uint8 & friends on Haiku
authorFrançois Revol <[email protected]>
Fri, 8 Jul 2022 23:23:29 +0000 (01:23 +0200)
committerGuy Harris <[email protected]>
Thu, 14 Jul 2022 05:13:28 +0000 (22:13 -0700)
Haiku declares and uses them for itself but in a different way.

(cherry picked from commit c58497773116be47da8423725b989380630773d8)

rpcap-protocol.h

index a69cf80233e1296a3057b9c72f249c7a87c41492..88d5133ae48c731e75d816d3076fc4d0591654c3 100644 (file)
  * 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