diff --git a/gpu/GrContext.cpp b/gpu/GrContext.cpp
index e62aa5d..9dfe761 100644
--- a/gpu/GrContext.cpp
+++ b/gpu/GrContext.cpp
@@ -1487,7 +1487,7 @@
     // We expect to be at least as fast or faster since it doesn't use an intermediate texture as
     // we do below.
 
-#if !GR_MAC_BUILD
+#if !defined(SK_BUILD_FOR_MAC)
     // At least some drivers on the Mac get confused when glTexImage2D is called on a texture
     // attached to an FBO. The FBO still sees the old image. TODO: determine what OS versions and/or
     // HW is affected.
diff --git a/gpu/gl/GrGpuGL.cpp b/gpu/gl/GrGpuGL.cpp
index 6f9a8ab..d1a7167 100644
--- a/gpu/gl/GrGpuGL.cpp
+++ b/gpu/gl/GrGpuGL.cpp
@@ -1604,9 +1604,9 @@
 #define SWAP_PER_DRAW 0
 
 #if SWAP_PER_DRAW
-    #if GR_MAC_BUILD
+    #if defined(SK_BUILD_FOR_MAC)
         #include <AGL/agl.h>
-    #elif GR_WIN32_BUILD
+    #elif defined(SK_BUILD_FOR_WIN32)
         #include <gl/GL.h>
         void SwapBuf() {
             DWORD procID = GetCurrentProcessId();
@@ -1645,11 +1645,11 @@
     }
 #if SWAP_PER_DRAW
     glFlush();
-    #if GR_MAC_BUILD
+    #if defined(SK_BUILD_FOR_MAC)
         aglSwapBuffers(aglGetCurrentContext());
         int set_a_break_pt_here = 9;
         aglSwapBuffers(aglGetCurrentContext());
-    #elif GR_WIN32_BUILD
+    #elif defined(SK_BUILD_FOR_WIN32)
         SwapBuf();
         int set_a_break_pt_here = 9;
         SwapBuf();