Change '#ifdef DEBUG' to '#if defined(DEBUG) || defined(NI_DEBUG)'

lts1610 · Dec 3, 2012 · e053703 · e053703
1 parent af86388
commit e053703
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/src/core/src/NIDebuggingTools.h b/src/core/src/NIDebuggingTools.h
@@ -84,7 +84,7 @@
  *      @{
  */
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 /**
  * Assertions that only fire when DEBUG is defined.
@@ -109,7 +109,7 @@ if (NIDebugAssertionsShouldBreak && NIIsInDebugger()) { raise(SIGTRAP); } } \
 
 #else
 #define NIDASSERT(xx) ((void)0)
-#endif // #ifdef DEBUG
+#endif // #if defined(DEBUG) || defined(NI_DEBUG)
 
 
 #define NILOGLEVEL_INFO     5
@@ -141,18 +141,18 @@ extern BOOL NIDebugAssertionsShouldBreak;
  * This log method will always write to the log, regardless of log levels. It is used by all
  * of the other logging methods in Nimbus' debugging library.
  */
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 #define NIDPRINT(xx, ...)  NSLog(@"%s(%d): " xx, __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 #else
 #define NIDPRINT(xx, ...)  ((void)0)
-#endif // #ifdef DEBUG
+#endif // #if defined(DEBUG) || defined(NI_DEBUG)
 
 /**
  * Write the containing method's name to the log using NIDPRINT.
  */
 #define NIDPRINTMETHODNAME() NIDPRINT(@"%s", __PRETTY_FUNCTION__)
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 /**
  * Only writes to the log if condition is satisified.
  *
@@ -163,7 +163,7 @@ extern BOOL NIDebugAssertionsShouldBreak;
 } ((void)0)
 #else
 #define NIDCONDITIONLOG(condition, xx, ...) ((void)0)
-#endif // #ifdef DEBUG
+#endif // #if defined(DEBUG) || defined(NI_DEBUG)
 
 
 /**

diff --git a/src/core/src/NIDebuggingTools.m b/src/core/src/NIDebuggingTools.m
@@ -24,7 +24,7 @@
 NSInteger NIMaxLogLevel = NILOGLEVEL_WARNING;
 BOOL NIDebugAssertionsShouldBreak = YES;
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 #import <unistd.h>
 #import <sys/sysctl.h>
@@ -58,4 +58,4 @@ int NIIsInDebugger(void) {
   return (info.kp_proc.p_flag & P_TRACED) != 0;
 }
 
-#endif // #ifdef DEBUG
+#endif // #if defined(DEBUG) || defined(NI_DEBUG)
diff --git a/src/core/src/NINetworkActivity.m b/src/core/src/NINetworkActivity.m
@@ -18,7 +18,7 @@
 
 #import "NIDebuggingTools.h"
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 #import "NIRuntimeClassModifications.h"
 #endif
 
@@ -112,7 +112,7 @@ void NINetworkActivityTaskDidFinish(void) {
 #pragma mark -
 #pragma mark Network Activity Debugging
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 static BOOL gNetworkActivityDebuggingEnabled = NO;
 
@@ -191,4 +191,4 @@ void NIDisableNetworkActivityDebugging(void) {
 }
 
 
-#endif // #ifdef DEBUG
+#endif // #if defined(DEBUG) || defined(NI_DEBUG)
diff --git a/src/overview/src/NIOverview.m b/src/overview/src/NIOverview.m
@@ -16,7 +16,7 @@
 
 #import "NIOverview.h"
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 #import "NIDeviceInfo.h"
 #import "NIOverviewView.h"
@@ -108,7 +108,7 @@ @implementation NIOverview
 #pragma mark -
 #pragma mark Device Orientation Changes
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (void)didChangeOrientation {
@@ -199,7 +199,7 @@ + (void)didReceiveMemoryWarning {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (void)applicationDidFinishLaunching {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
   if (!sOverviewIsAwake) {
     sOverviewIsAwake = YES;
 
@@ -229,7 +229,7 @@ + (void)applicationDidFinishLaunching {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (void)addOverviewToWindow:(UIWindow *)window {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
   if (nil != sOverviewView) {
     // Remove the old overview in case this gets called multiple times (not sure why you would
     // though).
@@ -258,7 +258,7 @@ + (void)addOverviewToWindow:(UIWindow *)window {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (NIOverviewLogger *)logger {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
   return [NIOverviewLogger sharedLogger];
 #else
   return nil;
@@ -268,7 +268,7 @@ + (NIOverviewLogger *)logger {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (CGFloat)height {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
   return sOverviewHeight;
 #else
   return 0;
@@ -278,7 +278,7 @@ + (CGFloat)height {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (CGRect)frame {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
   UIInterfaceOrientation orient = NIInterfaceOrientation();
   CGFloat overviewWidth;
   CGRect frame;
@@ -342,7 +342,7 @@ + (CGRect)frame {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 + (UIView *)view {
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
   return sOverviewView;
 #else
   return nil;

diff --git a/src/overview/src/NIOverviewPageView.h b/src/overview/src/NIOverviewPageView.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 #import "NIOverviewGraphView.h"
 

diff --git a/src/overview/src/NIOverviewPageView.m b/src/overview/src/NIOverviewPageView.m
@@ -16,7 +16,7 @@
 
 #import "NIOverviewPageView.h"
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 #import "NIOverview.h"
 #import "NIDeviceInfo.h"

diff --git a/src/overview/src/NIOverviewSwizzling.m b/src/overview/src/NIOverviewSwizzling.m
@@ -25,7 +25,7 @@
 #error "Nimbus requires ARC support."
 #endif
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 @interface UIApplication (Private)
 - (CGRect)_statusBarFrame;

diff --git a/src/overview/src/NIOverviewView.h b/src/overview/src/NIOverviewView.h
@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 @class NIOverviewPageView;
 

diff --git a/src/overview/src/NIOverviewView.m b/src/overview/src/NIOverviewView.m
@@ -16,7 +16,7 @@
 
 #import "NIOverviewView.h"
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(NI_DEBUG)
 
 #import "NimbusCore.h"