diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-14 22:41:24 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-14 22:41:24 +0200 |
| commit | 4c146156a36d48209a6206f61f80dc5d4c48ce93 (patch) | |
| tree | dc8e3b1c7daf41cdf965c9e3e6119dcb5d6a41e5 /runtime | |
| parent | d03d47c6e4ce9324d6d59ae36cb8db78b013be54 (diff) | |
| parent | f995a671ceb28c2a83e5e5574c3cdb46fd5e0f57 (diff) | |
| download | compcert-4c146156a36d48209a6206f61f80dc5d4c48ce93.tar.gz compcert-4c146156a36d48209a6206f61f80dc5d4c48ce93.zip | |
Merge branch 'master' into asmexpand
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/include/stdarg.h | 10 | ||||
| -rw-r--r-- | runtime/include/stddef.h | 26 |
2 files changed, 35 insertions, 1 deletions
diff --git a/runtime/include/stdarg.h b/runtime/include/stdarg.h index b2e7eadd..3e9eaf95 100644 --- a/runtime/include/stdarg.h +++ b/runtime/include/stdarg.h @@ -45,10 +45,20 @@ typedef __builtin_va_list __gnuc_va_list; #ifdef _STDARG_H +#ifdef __DCC__ #ifndef _VA_LIST_T #define _VA_LIST_T +#endif +#ifndef __VA_LIST +#define __VA_LIST typedef __builtin_va_list va_list; #endif +#else +#ifndef _VA_LIST_T +#define _VA_LIST_T +typedef __builtin_va_list va_list; +#endif +#endif #define va_start(v,l) __builtin_va_start(v,l) #define va_end(v) __builtin_va_end(v) diff --git a/runtime/include/stddef.h b/runtime/include/stddef.h index 3da06c6f..31edf4ef 100644 --- a/runtime/include/stddef.h +++ b/runtime/include/stddef.h @@ -38,6 +38,14 @@ #define _STDDEF_H #endif +#ifdef __DCC__ +#if !defined(__size_t) && !defined(_SIZE_T) +#define __size_t +#define _SIZE_T +typedef unsigned int size_t; +#endif +#undef __need_size_t +#else #if defined(_STDDEF_H) || defined(__need_size_t) #ifndef _SIZE_T #define _SIZE_T @@ -45,6 +53,7 @@ typedef unsigned long size_t; #endif #undef __need_size_t #endif +#endif #if defined(_STDDEF_H) || defined(__need_ptrdiff_t) #ifndef _PTRDIFF_T @@ -54,6 +63,20 @@ typedef signed long ptrdiff_t; #undef __need_ptrdiff_t #endif +#ifdef __DCC__ +#ifndef _WCHART +#define _WCHART +#ifndef __wchar_t +#define __wchar_t +#ifdef _TYPE_wchar_t +_TYPE_wchar_t; +#else +typedef unsigned short wchar_t; +#endif +#endif +#undef __need_wchar_t +#endif +#else #if defined(_STDDEF_H) || defined(__need_wchar_t) #ifndef _WCHAR_T #define _WCHAR_T @@ -65,6 +88,7 @@ typedef signed int wchar_t; #endif #undef __need_wchar_t #endif +#endif #if defined(_STDDEF_H) || defined(__need_NULL) #ifndef NULL @@ -74,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 |