commit 0c8d93a94099dee2dff8da6000ded9ad59676488
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 01 17:08:26 2011 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 01 17:08:26 2011 +0000
tree 93d68d568132740aef280b4badcf5edb90ce8b7f
parent 9ae4429f9d3ab837ff9352261271974715cabb8a

Reworks r1770 so that users who have replaced SkUserConfig don't have to
make any changes to continue compiling successfully.



git-svn-id: http://skia.googlecode.com/svn/trunk@1779 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrGLProgram.cpp

diff --git a/gpu/src/GrGLProgram.cpp b/gpu/src/GrGLProgram.cpp
index 733e705..31571ab 100644
--- a/gpu/src/GrGLProgram.cpp
+++ b/gpu/src/GrGLProgram.cpp
@@ -19,8 +19,8 @@
 #include "GrBinHashKey.h"
 #include "GrGLConfig.h"
 
+#include "SkTrace.h"
 #include "SkXfermode.h"
-#include SK_USER_TRACE_INCLUDE_FILE
 
 namespace {