*BSD: protect against incompatible redefinitions of int64_t/uint64_t.

Christian Jullien committed 5 years ago

Commit 33257c61 parent 8db839c1 file · +6 −1Browse files

Unified · Split

include/stddef.h+6−1

@@ -17,12 +17,17 @@ typedef union { long long __ll; long double __ld; } max_align_t; · 16 unmodified lines
17	17	typedef signed char int8_t;
18	18	typedef signed short int int16_t;
19	19	typedef signed int int32_t;
20		−typedef signed __INT64_TYPE__ int64_t;
21	20	typedef unsigned char uint8_t;
22	21	typedef unsigned short int uint16_t;
23	22	typedef unsigned int uint32_t;
	23	+#if defined(__LP64__) \
	24	+ && !defined(__FreeBSD__) \
	25	+ && !(defined(__NetBSD__) && defined(__aarch64__))
	26	+typedef signed __INT64_TYPE__ int64_t;
24	27	typedef unsigned __INT64_TYPE__ uint64_t;
25	28	#endif
	29	+#endif
	30	+#endif
26	31
27	32	#ifndef NULL
28	33	#define NULL ((void*)0)