From e8fee34c62f8cd1f89135fec35bf6031af0029fe Mon Sep 17 00:00:00 2001
From: Sean Callanan <scallanan@apple.com>
Date: Mon, 7 Nov 2016 21:10:31 +0000
Subject: [PATCH] Updated ASTMerge/macro.m to use _Nullable.

llvm-svn: 286151
---
 clang/test/ASTMerge/Inputs/macro1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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