| author |  Andrew Kelley <andrew@ziglang.org> 2018-09-10 15:55:39-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-09-10 15:55:39-04:00 |
| log | c7f70893923cd0a9d3be79b352e2674a87ad8127 |
| tree | 7f679efcd2603080d6699207db25f41fd299bcad |
| parent | e077d765fe521a78d7cc5a94002a235757b3c197 |
| signature |  Commit is signed but in an unrecognized format. |
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.2 files changed, 0 insertions(+), 45 deletions(-)
c_headers/stdarg.h-7
| ... | ... | @@ -26,14 +26,10 @@ |
| 26 | 26 | #ifndef __STDARG_H |
| 27 | 27 | #define __STDARG_H |
| 28 | 28 | |
| 29 | /* zig: added because macos _va_list.h was duplicately defining va_list | |
| 30 | */ | |
| 31 | 29 | #ifndef _VA_LIST |
| 32 | #ifndef _VA_LIST_T | |
| 33 | 30 | typedef __builtin_va_list va_list; |
| 34 | 31 | #define _VA_LIST |
| 35 | 32 | #endif |
| 36 | #endif | |
| 37 | 33 | #define va_start(ap, param) __builtin_va_start(ap, param) |
| 38 | 34 | #define va_end(ap) __builtin_va_end(ap) |
| 39 | 35 | #define va_arg(ap, type) __builtin_va_arg(ap, type) |
| ... | ... | @@ -50,9 +46,6 @@ typedef __builtin_va_list va_list; |
| 50 | 46 | #ifndef __GNUC_VA_LIST |
| 51 | 47 | #define __GNUC_VA_LIST 1 |
| 52 | 48 | typedef __builtin_va_list __gnuc_va_list; |
| 53 | /* zig: added because glibc stdio.h was duplicately defining va_list | |
| 54 | */ | |
| 55 | #define _VA_LIST_DEFINED | |
| 56 | 49 | #endif |
| 57 | 50 | |
| 58 | 51 | #endif /* __STDARG_H */ |
c_headers/stddef.h-38
| ... | ... | @@ -48,13 +48,7 @@ |
| 48 | 48 | #if !__has_feature(modules) |
| 49 | 49 | #define _PTRDIFF_T |
| 50 | 50 | #endif |
| 51 | ||
| 52 | /* Zig: wrap in _PTRDIFF_T_DEFINED to protect against mingw defining it twice */ | |
| 53 | #if !defined(_PTRDIFF_T_DEFINED) | |
| 54 | 51 | typedef __PTRDIFF_TYPE__ ptrdiff_t; |
| 55 | #define _PTRDIFF_T_DEFINED | |
| 56 | #endif | |
| 57 | ||
| 58 | 52 | #endif |
| 59 | 53 | #undef __need_ptrdiff_t |
| 60 | 54 | #endif /* defined(__need_ptrdiff_t) */ |
| ... | ... | @@ -65,24 +59,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; |
| 65 | 59 | #if !__has_feature(modules) |
| 66 | 60 | #define _SIZE_T |
| 67 | 61 | #endif |
| 68 | ||
| 69 | /* Zig: added to avoid collisions with mingw */ | |
| 70 | #if !defined(_SIZE_T_DEFINED_) | |
| 71 | #if !defined(_SIZE_T_DEFINED) | |
| 72 | #if !defined(_BSD_SIZE_T_DEFINED_) | |
| 73 | #if !defined(_SIZE_T_DECLARED) | |
| 74 | 62 | typedef __SIZE_TYPE__ size_t; |
| 75 | #define _SIZE_T_DEFINED_ | |
| 76 | #define _SIZE_T_DEFINED | |
| 77 | #define _BSD_SIZE_T_DEFINED_ | |
| 78 | #define _SIZE_T_DECLARED | |
| 79 | #endif | |
| 80 | #endif | |
| 81 | #endif | |
| 82 | #endif | |
| 83 | ||
| 84 | ||
| 85 | ||
| 86 | 63 | #endif |
| 87 | 64 | #undef __need_size_t |
| 88 | 65 | #endif /*defined(__need_size_t) */ |
| ... | ... | @@ -110,22 +87,7 @@ typedef __SIZE_TYPE__ rsize_t; |
| 110 | 87 | #define _WCHAR_T_DEFINED |
| 111 | 88 | #endif |
| 112 | 89 | #endif |
| 113 | ||
| 114 | /* zig added to prevent duplicate definition with mingw */ | |
| 115 | #if !defined(__INT_WCHAR_T_H) | |
| 116 | #if !defined(_GCC_WCHAR_T) | |
| 117 | #if !defined(_WCHAR_T_DECLARED) | |
| 118 | #if !defined(_WCHAR_T_DEFINED) | |
| 119 | #define __INT_WCHAR_T_H | |
| 120 | #define _GCC_WCHAR_T | |
| 121 | #define _WCHAR_T_DECLARED | |
| 122 | #define _WCHAR_T_DEFINED | |
| 123 | 90 | typedef __WCHAR_TYPE__ wchar_t; |
| 124 | #endif | |
| 125 | #endif | |
| 126 | #endif | |
| 127 | #endif | |
| 128 | ||
| 129 | 91 | #endif |
| 130 | 92 | #endif |
| 131 | 93 | #undef __need_wchar_t |