From e923cccb258e920d1ef91ff39a4da83d8c856d0e Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 11 Jul 2018 16:45:06 +0000 Subject: Revert "SkDEBUGF: use __VA_ARGS__" This reverts commit 2267a092356d17f6444502dc92491485ccf24341. Reason for revert: It looks like Google 3 is failing to compile w/ this CL Original change's description: > SkDEBUGF: use __VA_ARGS__ > > Change-Id: I42a47e821ff7a7f6cec65b38a8216cabbf0acfce > Reviewed-on: https://skia-review.googlesource.com/139860 > Reviewed-by: Mike Klein > Commit-Queue: Hal Canary TBR=mtklein@google.com,halcanary@google.com,reed@google.com Change-Id: I3aab490f3d2fea103fc915ca01cb0e294df86739 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/140660 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- include/core/SkTypes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 2ff637387d..be51e20bac 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -58,7 +58,7 @@ SK_API extern void sk_abort_no_print(void); #define SkDEBUGFAIL(message) SK_ABORT(message) #define SkDEBUGFAILF(fmt, ...) SkASSERTF(false, fmt, ##__VA_ARGS__) #define SkDEBUGCODE(...) __VA_ARGS__ - #define SkDEBUGF(...) SkDebugf(__VA_ARGS__) + #define SkDEBUGF(args ) SkDebugf args #define SkAssertResult(cond) SkASSERT(cond) #else #define SkASSERT(cond) static_cast(0) @@ -66,7 +66,7 @@ SK_API extern void sk_abort_no_print(void); #define SkDEBUGFAIL(message) #define SkDEBUGFAILF(fmt, ...) #define SkDEBUGCODE(...) - #define SkDEBUGF(...) + #define SkDEBUGF(args) // unlike SkASSERT, this macro executes its condition in the non-debug build. // The if is present so that this can be used with functions marked SK_WARN_UNUSED_RESULT. -- cgit v1.2.3