mirror of
https://github.com/ziglang/zig.git
synced 2024-12-13 23:00:57 +00:00
fix some c header symbol collisions
This commit is contained in:
parent
fe95a227c8
commit
1d3c25e928
@ -48,7 +48,13 @@
|
||||
#if !__has_feature(modules)
|
||||
#define _PTRDIFF_T
|
||||
#endif
|
||||
|
||||
/* Zig: wrap in _PTRDIFF_T_DEFINED to protect against mingw defining it twice */
|
||||
#if !defined(_PTRDIFF_T_DEFINED)
|
||||
typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
||||
#define _PTRDIFF_T_DEFINED
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#undef __need_ptrdiff_t
|
||||
#endif /* defined(__need_ptrdiff_t) */
|
||||
@ -59,7 +65,24 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
||||
#if !__has_feature(modules)
|
||||
#define _SIZE_T
|
||||
#endif
|
||||
|
||||
/* Zig: added to avoid collisions with mingw */
|
||||
#if !defined(_SIZE_T_DEFINED_)
|
||||
#if !defined(_SIZE_T_DEFINED)
|
||||
#if !defined(_BSD_SIZE_T_DEFINED_)
|
||||
#if !defined(_SIZE_T_DECLARED)
|
||||
typedef __SIZE_TYPE__ size_t;
|
||||
#define _SIZE_T_DEFINED_
|
||||
#define _SIZE_T_DEFINED
|
||||
#define _BSD_SIZE_T_DEFINED_
|
||||
#define _SIZE_T_DECLARED
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
#undef __need_size_t
|
||||
#endif /*defined(__need_size_t) */
|
||||
@ -87,7 +110,22 @@ typedef __SIZE_TYPE__ rsize_t;
|
||||
#define _WCHAR_T_DEFINED
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* zig added to prevent duplicate definition with mingw */
|
||||
#if !defined(__INT_WCHAR_T_H)
|
||||
#if !defined(_GCC_WCHAR_T)
|
||||
#if !defined(_WCHAR_T_DECLARED)
|
||||
#if !defined(_WCHAR_T_DEFINED)
|
||||
#define __INT_WCHAR_T_H
|
||||
#define _GCC_WCHAR_T
|
||||
#define _WCHAR_T_DECLARED
|
||||
#define _WCHAR_T_DEFINED
|
||||
typedef __WCHAR_TYPE__ wchar_t;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
#undef __need_wchar_t
|
||||
|
Loading…
Reference in New Issue
Block a user