Permalink
Browse files

Fix ENABLE_INSPECTOR ifdef not found during dev

Reviewed By: bnham

Differential Revision: D5680963

fbshipit-source-id: d38c4575387ba58e3819f5aa5c35078ed8ed3e87
  • Loading branch information...
pakoito authored and facebook-github-bot committed Aug 24, 2017
1 parent 0b17524 commit edf60ce6408e61ef60ce20a951dd7bab0dbc868b
Showing with 11 additions and 5 deletions.
  1. +2 −2 React/Base/RCTBridge.m
  2. +8 −0 React/Base/RCTDefines.h
  3. +1 −3 React/Modules/RCTDevSettings.mm
View
@@ -14,7 +14,7 @@
#import "RCTConvert.h"
#import "RCTEventDispatcher.h"
#if ENABLE_INSPECTOR
#if RCT_ENABLE_INSPECTOR
#import "RCTInspectorDevServerHelper.h"
#endif
#import "RCTJSEnvironment.h"
@@ -258,7 +258,7 @@ - (void)whitelistedModulesDidChange
- (void)reload
{
#if ENABLE_INSPECTOR
#if RCT_ENABLE_INSPECTOR
// Disable debugger to resume the JsVM & avoid thread locks while reloading
[RCTInspectorDevServerHelper disableDebugger];
#endif
View
@@ -48,6 +48,14 @@
#endif
#endif
#ifndef RCT_ENABLE_INSPECTOR
#if RCT_DEV && __has_include(<React/RCTInspectorDevServerHelper.h>)
#define RCT_ENABLE_INSPECTOR 1
#else
#define RCT_ENABLE_INSPECTOR 0
#endif
#endif
#if RCT_DEV
#define RCT_IF_DEV(...) __VA_ARGS__
#else
@@ -42,9 +42,7 @@
#import "RCTPackagerConnection.h"
#endif
#define ENABLE_INSPECTOR RCT_DEV && __has_include("RCTInspectorDevServerHelper.h")
#if ENABLE_INSPECTOR
#if RCT_ENABLE_INSPECTOR
#import "RCTInspectorDevServerHelper.h"
#endif

0 comments on commit edf60ce

Please sign in to comment.