3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkInstCnt.cpp b/src/core/SkInstCnt.cpp
index 2f9a57dc2b..0211b123ee 100644
--- a/src/core/SkInstCnt.cpp
+++ b/src/core/SkInstCnt.cpp
@@ -7,6 +7,6 @@
 
 #include "SkInstCnt.h"
 
-#if SK_ENABLE_INST_COUNT
-bool gPrintInstCount = false;
+#if SK_ENABLE_INST_COUNT && !defined(SKIA_DLL)  // See SkInstCnt.h
+    bool gPrintInstCount = false;
 #endif
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index 6275ced6fc..14919bb786 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -14,7 +14,7 @@
 
 class BufferObj {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(BufferObj);
+    SK_DECLARE_INST_COUNT(BufferObj);
 
     BufferObj(GrGLuint id) : fID(id), fDataPtr(NULL), fSize(0), fMapped(false) {
     }
@@ -47,7 +47,7 @@ private:
 // This class maintains a sparsely populated array of buffer pointers.
 class BufferManager {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(BufferManager);
+    SK_DECLARE_INST_COUNT(BufferManager);
 
     BufferManager() : fFreeListHead(kFreeListEnd) {}
 
@@ -116,7 +116,7 @@ private:
  */
 struct ThreadContext {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(ThreadContext);
+    SK_DECLARE_INST_COUNT(ThreadContext);
 
     BufferManager   fBufferManager;
     GrGLuint        fCurrArrayBuffer;
diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp
index 688b22ed04..a9202215eb 100644
--- a/src/gpu/gl/GrGLGpuProgramCache.cpp
+++ b/src/gpu/gl/GrGLGpuProgramCache.cpp
@@ -23,7 +23,7 @@ SK_CONF_DECLARE(bool, c_DisplayCache, "gpu.displayCache", false,
 typedef GrGLProgramDataManager::UniformHandle UniformHandle;
 
 struct GrGLGpu::ProgramCache::Entry {
-    SK_DECLARE_INST_COUNT_ROOT(Entry);
+    SK_DECLARE_INST_COUNT(Entry);
     Entry() : fProgram(NULL), fLRUStamp(0) {}
 
     SkAutoTUnref<GrGLProgram>   fProgram;