diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2015-07-08 12:04:28 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2015-07-08 12:04:28 +0200 |
| commit | 52c6be30048bf9b77b9dd6bc66f052ee5386f16e (patch) | |
| tree | 87ab50782e40116d4b23b6f61d90030d304993dd /runtime/include | |
| parent | ab1ddcd0d579d7e5760c6cfa84adbd55212c47e7 (diff) | |
| parent | f869da75c970aec78975f7154c806f29e3012b7a (diff) | |
| download | compcert-52c6be30048bf9b77b9dd6bc66f052ee5386f16e.tar.gz compcert-52c6be30048bf9b77b9dd6bc66f052ee5386f16e.zip | |
Merge branch 'master' of https://github.com/AbsInt/CompCert
Diffstat (limited to 'runtime/include')
| -rw-r--r-- | runtime/include/stdarg.h | 4 | ||||
| -rw-r--r-- | runtime/include/stddef.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/runtime/include/stdarg.h b/runtime/include/stdarg.h index b2e7eadd..272b6320 100644 --- a/runtime/include/stdarg.h +++ b/runtime/include/stdarg.h @@ -50,6 +50,10 @@ typedef __builtin_va_list __gnuc_va_list; typedef __builtin_va_list va_list; #endif +#ifndef __VA_LIST +#define __VA_LIST +#endif + #define va_start(v,l) __builtin_va_start(v,l) #define va_end(v) __builtin_va_end(v) #define va_arg(v,l) __builtin_va_arg(v,l) diff --git a/runtime/include/stddef.h b/runtime/include/stddef.h index 290434f4..31edf4ef 100644 --- a/runtime/include/stddef.h +++ b/runtime/include/stddef.h @@ -71,7 +71,7 @@ typedef signed long ptrdiff_t; #ifdef _TYPE_wchar_t _TYPE_wchar_t; #else -typedef signed int wchar_t; +typedef unsigned short wchar_t; #endif #endif #undef __need_wchar_t @@ -98,7 +98,7 @@ typedef signed int wchar_t; #endif #if defined(_STDDEF_H) && !defined(offsetof) -#define offsetof(ty,member) ((size_t) &(((ty)*) NULL)->member) +#define offsetof(ty,member) ((size_t) &((ty*) NULL)->member) #endif #endif |