From 594497d2348362e64a5dc3a376b11aedb8ebc81a Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Sat, 21 Mar 2015 11:10:10 -0700 Subject: [PATCH] Updated for CocoaLumberJack 2.0 --- GCDWebServer/Core/GCDWebServer.m | 4 ++-- GCDWebServer/Core/GCDWebServerPrivate.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GCDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m index 0a8d31e..b005146 100644 --- a/GCDWebServer/Core/GCDWebServer.m +++ b/GCDWebServer/Core/GCDWebServer.m @@ -74,9 +74,9 @@ GCDWebServerLoggingLevel GCDWebServerLogLevel = kGCDWebServerLoggingLevel_Info; #endif #elif defined(__GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__) #if DEBUG -int GCDWebServerLogLevel = LOG_LEVEL_DEBUG; +DDLogLevel GCDWebServerLogLevel = DDLogLevelDebug; #else -int GCDWebServerLogLevel = LOG_LEVEL_INFO; +DDLogLevel GCDWebServerLogLevel = DDLogLevelInfo; #endif #endif diff --git a/GCDWebServer/Core/GCDWebServerPrivate.h b/GCDWebServer/Core/GCDWebServerPrivate.h index 3ab85c6..e1cd87e 100644 --- a/GCDWebServer/Core/GCDWebServerPrivate.h +++ b/GCDWebServer/Core/GCDWebServerPrivate.h @@ -87,15 +87,15 @@ * it as a logging facility. */ -#elif defined(__has_include) && __has_include("DDLogMacros.h") +#elif defined(__has_include) && __has_include("CocoaLumberjack/CocoaLumberjack.h") -#import "DDLogMacros.h" +#import #define __GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__ #undef LOG_LEVEL_DEF #define LOG_LEVEL_DEF GCDWebServerLogLevel -extern int GCDWebServerLogLevel; +extern DDLogLevel GCDWebServerLogLevel; #define GWS_LOG_DEBUG(...) DDLogDebug(__VA_ARGS__) #define GWS_LOG_VERBOSE(...) DDLogVerbose(__VA_ARGS__)