diff options
author | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-28 22:01:30 +0000 |
---|---|---|
committer | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-28 22:01:30 +0000 |
commit | bcc81cc1b7632c74183315c2c7ba49bca8694820 (patch) | |
tree | 5a9af4321772a9970d20903e24e70ecbd59e8444 /include/clang/Basic/Builtins.def | |
parent | 7fade2fe3e8cb63141fac7255f7d5b99ff713dc8 (diff) | |
download | clang-bcc81cc1b7632c74183315c2c7ba49bca8694820.tar.gz clang-bcc81cc1b7632c74183315c2c7ba49bca8694820.tar.bz2 clang-bcc81cc1b7632c74183315c2c7ba49bca8694820.tar.xz |
Merging r168674: into the 3.2 release branch.
Fix the definition of the vfork() builtin on Haiku. PR14378.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_32@168819 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic/Builtins.def')
-rw-r--r-- | include/clang/Basic/Builtins.def | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/clang/Basic/Builtins.def b/include/clang/Basic/Builtins.def index e278137fa4..d48eadcd6b 100644 --- a/include/clang/Basic/Builtins.def +++ b/include/clang/Basic/Builtins.def @@ -41,6 +41,7 @@ // J -> jmp_buf // SJ -> sigjmp_buf // K -> ucontext_t +// p -> pid_t // . -> "...". This may only occur at the end of the function list. // // Types may be prefixed with the following modifiers: @@ -737,7 +738,7 @@ LIBBUILTIN(strcasecmp, "icC*cC*", "f", "strings.h", ALL_LANGUAGES) LIBBUILTIN(strncasecmp, "icC*cC*z", "f", "strings.h", ALL_LANGUAGES) // POSIX unistd.h LIBBUILTIN(_exit, "vi", "fr", "unistd.h", ALL_LANGUAGES) -LIBBUILTIN(vfork, "i", "fj", "unistd.h", ALL_LANGUAGES) +LIBBUILTIN(vfork, "p", "fj", "unistd.h", ALL_LANGUAGES) // POSIX setjmp.h // In some systems setjmp is a macro that expands to _setjmp. We undefine |