diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-09-07 20:10:03 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-09-07 20:10:03 +0000 |
| commit | 016c61beed874f36d4ef5f3417fc0d68f3bdb903 (patch) | |
| tree | 037d8bef24f380e7cdde6ad11fe6c534a71315b7 /contrib/llvm-project | |
| parent | 9464e1ef97fc5d233c65bf1256b18ab223d8ffbf (diff) | |
| download | src-test-016c61beed874f36d4ef5f3417fc0d68f3bdb903.tar.gz src-test-016c61beed874f36d4ef5f3417fc0d68f3bdb903.zip | |
Merge commit 47b0262d3 from llvm git (by me):
Add <stdarg.h> include to kmp_os.h, to get the va_list type, required
after cde8f4c164a2. Sort system includes, while here.
The original merged commit works fine by itself on head, but fails to
compile on stable branches because stdarg.h is not implicitly pulled in.
MFC after: immediately, to fix failing builds on stable/{11,12}
Notes
Notes:
svn path=/head/; revision=365429
Diffstat (limited to 'contrib/llvm-project')
| -rw-r--r-- | contrib/llvm-project/openmp/runtime/src/kmp_os.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/llvm-project/openmp/runtime/src/kmp_os.h b/contrib/llvm-project/openmp/runtime/src/kmp_os.h index 1ff20ae17a25d..2fbdef1c3ba83 100644 --- a/contrib/llvm-project/openmp/runtime/src/kmp_os.h +++ b/contrib/llvm-project/openmp/runtime/src/kmp_os.h @@ -14,8 +14,9 @@ #define KMP_OS_H #include "kmp_config.h" -#include <stdlib.h> #include <atomic> +#include <stdarg.h> +#include <stdlib.h> #define KMP_FTN_PLAIN 1 #define KMP_FTN_APPEND 2 |