diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2019-03-13 13:07:24 +0100 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2019-03-13 13:07:24 +0100 |
| commit | 41c895850f75e3084fc8efdb7c9b1f7c8ec4fa5d (patch) | |
| tree | 3126fa4af7ba97dbc4f4f841a81820c95a2e35a3 /runtime | |
| parent | 8f972659841ad38f6f548161b5ca3cfcbdd135cb (diff) | |
| parent | 72ba1c282e2a8bfd0e826352a251fa71bfb71e05 (diff) | |
| download | compcert-kvx-41c895850f75e3084fc8efdb7c9b1f7c8ec4fa5d.tar.gz compcert-kvx-41c895850f75e3084fc8efdb7c9b1f7c8ec4fa5d.zip | |
Merge branch 'master' into mppa_postpass
Conflicts:
.gitignore
runtime/include/stdbool.h
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/include/stdbool.h | 1 | ||||
| -rw-r--r-- | runtime/include/stddef.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/include/stdbool.h b/runtime/include/stdbool.h index 07a25eb0..c549da08 100644 --- a/runtime/include/stdbool.h +++ b/runtime/include/stdbool.h @@ -36,4 +36,5 @@ #define true 1 #define false 0 #define __bool_true_false_are_defined 1 + #endif diff --git a/runtime/include/stddef.h b/runtime/include/stddef.h index 6056db62..5a66215a 100644 --- a/runtime/include/stddef.h +++ b/runtime/include/stddef.h @@ -108,7 +108,7 @@ typedef signed int wchar_t; #if defined(_STDDEF_H) || defined(__need_NULL) #ifndef NULL -#define NULL 0 +#define NULL ((void *) 0) #endif #undef __need_NULL #endif |