diff options
| author | Douglas Gregor <dgregor@apple.com> | 2015-06-24 22:02:08 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2015-06-24 22:02:08 +0000 |
| commit | aea7afdc1304cfef3b2cf61793729b1f55f26d0a (patch) | |
| tree | 80670a6c9757e83d93e42c74128d0730cbaea889 /clang/test/Parser/nullability.c | |
| parent | 63d606bdcb606ace3cea3455dcaf0c3dac108d4e (diff) | |
| download | bcm5719-llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.tar.gz bcm5719-llvm-aea7afdc1304cfef3b2cf61793729b1f55f26d0a.zip | |
Replace __double_underscored type nullability qualifiers with _Uppercase_underscored
Addresses a conflict with glibc's __nonnull macro by renaming the type
nullability qualifiers as follows:
__nonnull -> _Nonnull
__nullable -> _Nullable
__null_unspecified -> _Null_unspecified
This is the major part of rdar://problem/21530726, but does not yet
provide the Darwin-specific behavior for the old names.
llvm-svn: 240596
Diffstat (limited to 'clang/test/Parser/nullability.c')
| -rw-r--r-- | clang/test/Parser/nullability.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/Parser/nullability.c b/clang/test/Parser/nullability.c index f2b6abf73dc..f500e79d7d1 100644 --- a/clang/test/Parser/nullability.c +++ b/clang/test/Parser/nullability.c @@ -1,10 +1,10 @@ // RUN: %clang_cc1 -fsyntax-only -std=c99 -Wno-nullability-declspec -pedantic %s -verify -__nonnull int *ptr; // expected-warning{{type nullability specifier '__nonnull' is a Clang extension}} +_Nonnull int *ptr; // expected-warning{{type nullability specifier '_Nonnull' is a Clang extension}} #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wnullability-extension" -__nonnull int *ptr2; // no-warning +_Nonnull int *ptr2; // no-warning #pragma clang diagnostic pop #if __has_feature(nullability) |
