From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Sat, 17 Feb 2018 17:58:31 +0000 (+0100)
Subject: wg: do not collide types with libc clashes
X-Git-Tag: v1.0.20191226~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ecc49a62fd354f01b351258ee5cdb89dd6f62dd;p=thirdparty%2Fwireguard-tools.git

wg: do not collide types with libc clashes

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/src/curve25519.c b/src/curve25519.c
index 664cd80..2195040 100644
--- a/src/curve25519.c
+++ b/src/curve25519.c
@@ -8,12 +8,18 @@
 #include <stdint.h>
 #include <string.h>
 
-typedef uint64_t u64;
-typedef uint32_t u32;
+#ifdef __linux__
+#include <linux/types.h>
+typedef __u64 u64;
+typedef __u32 u32;
+typedef __u8 u8;
+typedef __s64 s64;
+#else
+typedef uint64_t u64, __le64;
+typedef uint32_t u32, __le32;
 typedef uint8_t u8;
 typedef int64_t s64;
-typedef u64 __le64;
-typedef u32 __le32;
+#endif
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #define le64_to_cpup(a) __builtin_bswap64(*(a))
 #define le32_to_cpup(a) __builtin_bswap32(*(a))