r286151 - Updated ASTMerge/macro.m to use _Nullable.

[Sean Callanan via cfe-commits]

Author: spyffe
Date: Mon Nov  7 15:10:31 2016
New Revision: 286151

URL: http://llvm.org/viewvc/llvm-project?rev=286151&view=rev
Log:
Updated ASTMerge/macro.m to use _Nullable.

Modified:
    cfe/trunk/test/ASTMerge/Inputs/macro1.h

Modified: cfe/trunk/test/ASTMerge/Inputs/macro1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/Inputs/macro1.h?rev=286151&r1=286150&r2=286151&view=diff
==============================================================================
--- cfe/trunk/test/ASTMerge/Inputs/macro1.h (original)
+++ cfe/trunk/test/ASTMerge/Inputs/macro1.h Mon Nov  7 15:10:31 2016
@@ -2,4 +2,4 @@ typedef void *VoidRef;
 
 void maybeNull(
   int i,
-  __nullable VoidRef *__nullable);
+  _Nullable VoidRef *_Nullable);