rather exclude the whole file than use defines

diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index 6787dd7..cb56ca1 100644 (file)
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SkTypes.h"
-#if defined(SK_BUILD_FOR_WIN32) && !defined (SK_BUILD_FOR_WINRT)
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBase64.h"
@@ -2514,4 +2514,4 @@ private:
 
 SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
 
-#endif // defined(SK_BUILD_FOR_WIN32) && !defined (SK_BUILD_FOR_WINRT)
+#endif

diff --git a/src/utils/win/SkWGL.h b/src/utils/win/SkWGL.h
index 0d7bd71..d16a107 100644 (file)
--- a/src/utils/win/SkWGL.h
+++ b/src/utils/win/SkWGL.h
@@ -8,8 +8,6 @@
 
 #include "SkRefCnt.h"
 
-#ifndef SK_BUILD_FOR_WINRT
-
 #ifndef SkWGL_DEFINED
 #define SkWGL_DEFINED
 
@@ -167,6 +165,4 @@ private:
     SkWGLExtensions fExtensions;
 };
 
-#endif
-
-#endif // SK_BUILD_FOR_WINRT
\ No newline at end of file
+#endif
\ No newline at end of file

diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp
index b10ebd1..5afcae9 100644 (file)
--- a/src/utils/win/SkWGL_win.cpp
+++ b/src/utils/win/SkWGL_win.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "SkTypes.h"
-#if defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_WINRT)
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkWGL.h"
 
@@ -462,4 +462,4 @@ SkWGLPbufferContext::SkWGLPbufferContext(HPBUFFER pbuffer, HDC dc, HGLRC glrc)
     , fGLRC(glrc) {
 }
 
-#endif // defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_WINRT)
+#endif//defined(SK_BUILD_FOR_WIN32)