From 7f3618a2c98e87a2db6a7926d83457cfc0ecf171 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 11 Feb 2019 14:49:05 -0500 Subject: [PATCH] Use clang versions of SK_RESTRICT and SK_WARN_UNUSED_RESULT on Windows Bug: skia: Change-Id: I63bc32c7bba294d8698d17e1f178ca0eb0a84ddf Reviewed-on: https://skia-review.googlesource.com/c/191295 Commit-Queue: Brian Osman Commit-Queue: Mike Klein Auto-Submit: Brian Osman Reviewed-by: Mike Klein --- include/core/SkPreConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 1f83c143f5..923d9650de 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -44,7 +44,7 @@ ////////////////////////////////////////////////////////////////////// -#ifdef SK_BUILD_FOR_WIN +#if defined(SK_BUILD_FOR_WIN) && !defined(__clang__) #if !defined(SK_RESTRICT) #define SK_RESTRICT __restrict #endif