mirror of
https://github.com/ziglang/zig.git
synced 2025-01-19 00:11:37 +00:00
drop patches on top of clang's C headers
We now match clang 7.0.0rc3 exactly. See https://reviews.llvm.org/D51265 for more details.
This commit is contained in:
parent
e077d765fe
commit
c7f7089392
@ -26,14 +26,10 @@
|
||||
#ifndef __STDARG_H
|
||||
#define __STDARG_H
|
||||
|
||||
/* zig: added because macos _va_list.h was duplicately defining va_list
|
||||
*/
|
||||
#ifndef _VA_LIST
|
||||
#ifndef _VA_LIST_T
|
||||
typedef __builtin_va_list va_list;
|
||||
#define _VA_LIST
|
||||
#endif
|
||||
#endif
|
||||
#define va_start(ap, param) __builtin_va_start(ap, param)
|
||||
#define va_end(ap) __builtin_va_end(ap)
|
||||
#define va_arg(ap, type) __builtin_va_arg(ap, type)
|
||||
@ -50,9 +46,6 @@ typedef __builtin_va_list va_list;
|
||||
#ifndef __GNUC_VA_LIST
|
||||
#define __GNUC_VA_LIST 1
|
||||
typedef __builtin_va_list __gnuc_va_list;
|
||||
/* zig: added because glibc stdio.h was duplicately defining va_list
|
||||
*/
|
||||
#define _VA_LIST_DEFINED
|
||||
#endif
|
||||
|
||||
#endif /* __STDARG_H */
|
||||
|
@ -48,13 +48,7 @@
|
||||
#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) */
|
||||
@ -65,24 +59,7 @@ 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) */
|
||||
@ -110,22 +87,7 @@ 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