From c5146e0b468a806e6fd9c639ae9015fff4e2ec63 Mon Sep 17 00:00:00 2001 From: Francesco Ceravolo Date: Mon, 8 May 2017 12:20:42 +0200 Subject: [PATCH] renaming --- Blabber/Classes/Base/obj-c/SDLogger.h | 2 +- Blabber/Classes/Base/obj-c/SDLogger.m | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Blabber/Classes/Base/obj-c/SDLogger.h b/Blabber/Classes/Base/obj-c/SDLogger.h index 0f11fc0..1779426 100644 --- a/Blabber/Classes/Base/obj-c/SDLogger.h +++ b/Blabber/Classes/Base/obj-c/SDLogger.h @@ -14,7 +14,7 @@ #import #if __has_include("CocoaLumberjack.h") || __has_include("CocoaLumberjack/CocoaLumberjack.h") -#define HAS_COCOALUMBERJACK 1 +#define COCOALUMBERJACK_AVAILABLE 1 #import #endif diff --git a/Blabber/Classes/Base/obj-c/SDLogger.m b/Blabber/Classes/Base/obj-c/SDLogger.m index d92e3fe..ad1afc8 100644 --- a/Blabber/Classes/Base/obj-c/SDLogger.m +++ b/Blabber/Classes/Base/obj-c/SDLogger.m @@ -15,7 +15,7 @@ #import "SDLogger.h" #import "DDLog.h" -#ifdef HAS_COCOALUMBERJACK +#ifdef COCOALUMBERJACK_AVAILABLE #import "SDDDFormatter.h" #endif @@ -23,7 +23,7 @@ @interface SDLoggerUtils : NSObject -#ifdef HAS_COCOALUMBERJACK +#ifdef COCOALUMBERJACK_AVAILABLE + (DDLogLevel)ddLogLevelFromSDLogLevel:(SDLogLevel)level; + (DDLogFlag)ddLogFlagFromSDLogLevel:(SDLogLevel)level; #endif @@ -33,7 +33,7 @@ + (DDLogFlag)ddLogFlagFromSDLogLevel:(SDLogLevel)level; @implementation SDLoggerUtils -#ifdef HAS_COCOALUMBERJACK +#ifdef COCOALUMBERJACK_AVAILABLE /** * utility method to convert SDLogLevel into corresponding DDLogLevel */ @@ -179,7 +179,7 @@ - (void)setup - (void) setupWithLoggers:(NSArray*)loggers { -#ifdef HAS_COCOALUMBERJACK +#ifdef COCOALUMBERJACK_AVAILABLE // default setup if (loggers.count == 0) { @@ -302,7 +302,7 @@ - (void) logWithLevel:(SDLogLevel)level module:(NSString *)module file:(NSString // Log with CocoaLumberjack if (format) { -#ifdef HAS_COCOALUMBERJACK +#ifdef COCOALUMBERJACK_AVAILABLE [DDLog log:!syncLog level:[SDLoggerUtils ddLogLevelFromSDLogLevel:level] flag:[SDLoggerUtils ddLogFlagFromSDLogLevel:level]