CMake, include/: changes to make fiddle 2.0 better

include/utils/win/SkHRESULT.h

Index: include/utils/win/SkHRESULT.h
diff --git a/include/utils/win/SkHRESULT.h b/include/utils/win/SkHRESULT.h
index 4f9d1bec796e11cd6612bd578f9fb2c143db8dd7..a6cc1d21b9db5e7e463453af96a37c7587632826 100644
--- a/include/utils/win/SkHRESULT.h
+++ b/include/utils/win/SkHRESULT.h
@@ -9,6 +9,7 @@
 #define SkHRESULT_DEFINED
 
 #include "SkTypes.h"
+#ifdef SK_BUILD_FOR_WIN
 
 void SkTraceHR(const char* file, unsigned long line,
                HRESULT hr, const char* msg);
@@ -55,4 +56,5 @@ The HRZ variants will return 0 when FAILED.
 #define HRZ(ex) HR_GENERAL(ex, NULL, 0)
 #define HRZM(ex, msg) HR_GENERAL(ex, msg, 0)
 //@}
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkHRESULT_DEFINED