From 2ee8410a718e0868c4d286b1cc5b5085dbf59d46 Mon Sep 17 00:00:00 2001
From: Nick Lockwood <nicklockwood@fb.com>
Date: Thu, 11 Jun 2015 10:42:00 -0700
Subject: [PATCH] Removed nullability attributes until Infer supports them

---
 Libraries/Image/RCTImageLoader.m   |  2 +-
 Libraries/Network/RCTDataManager.m |  4 ++--
 React/Base/RCTDefines.h            | 15 ---------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
index f28502d7e..04fa17f5d 100644
--- a/Libraries/Image/RCTImageLoader.m
+++ b/Libraries/Image/RCTImageLoader.m
@@ -22,7 +22,7 @@
 #import "RCTLog.h"
 #import "RCTUtils.h"
 
-static void RCTDispatchCallbackOnMainQueue(void (^ __nonnull callback)(NSError *, id), NSError *error, UIImage *image)
+static void RCTDispatchCallbackOnMainQueue(void (^callback)(NSError *, id), NSError *error, UIImage *image)
 {
   if ([NSThread isMainThread]) {
     callback(error, image);
diff --git a/Libraries/Network/RCTDataManager.m b/Libraries/Network/RCTDataManager.m
index a05e942fb..875d99f31 100644
--- a/Libraries/Network/RCTDataManager.m
+++ b/Libraries/Network/RCTDataManager.m
@@ -42,7 +42,7 @@ typedef void (^RCTHTTPQueryResult)(NSError *error, NSDictionary *result);
   NSString *boundary;
 }
 
-- (void)process:(NSArray *)formData callback:(nonnull void (^)(NSError *error, NSDictionary *result))callback
+- (void)process:(NSArray *)formData callback:(void (^)(NSError *error, NSDictionary *result))callback
 {
   if (![formData count]) {
     callback(nil, nil);
@@ -298,7 +298,7 @@ RCT_EXPORT_MODULE()
  * - @"contentType" (NSString): the content type header of the request
  *
  */
-- (void)processDataForHTTPQuery:(NSDictionary *)query callback:(nonnull void (^)(NSError *error, NSDictionary *result))callback
+- (void)processDataForHTTPQuery:(NSDictionary *)query callback:(void (^)(NSError *error, NSDictionary *result))callback
 {
   if (!query) {
     callback(nil, nil);
diff --git a/React/Base/RCTDefines.h b/React/Base/RCTDefines.h
index 33328789b..7c6d88409 100644
--- a/React/Base/RCTDefines.h
+++ b/React/Base/RCTDefines.h
@@ -18,21 +18,6 @@
 #define RCT_EXTERN extern __attribute__((visibility("default")))
 #endif
 
-/**
- * Nullability for Xcode 6.2
- */
-#if !__has_feature(nullability)
-#define NS_ASSUME_NONNULL_BEGIN
-#define NS_ASSUME_NONNULL_END
-#define nullable
-#define nonnull
-#define null_unspecified
-#define null_resettable
-#define __nullable
-#define __nonnull
-#define __null_unspecified
-#endif
-
 /**
  * The RCT_DEBUG macro can be used to exclude error checking and logging code
  * from release builds to improve performance and reduce binary size.