From: Sean Callanan <scallanan@apple.com>
Date: Mon, 7 Nov 2016 21:10:31 +0000 (+0000)
Subject: Updated ASTMerge/macro.m to use _Nullable.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91eab399fc0bc20dfb971bb7b32f68d4949bba94;p=clang

Updated ASTMerge/macro.m to use _Nullable.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@286151 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/ASTMerge/Inputs/macro1.h b/test/ASTMerge/Inputs/macro1.h
index f089e61254..9613394967 100644
--- a/test/ASTMerge/Inputs/macro1.h
+++ b/test/ASTMerge/Inputs/macro1.h
@@ -2,4 +2,4 @@ typedef void *VoidRef;
 
 void maybeNull(
   int i,
-  __nullable VoidRef *__nullable);
+  _Nullable VoidRef *_Nullable);