| commit | 6f47663000b68849cd9df11c30985a2e6382e785 | [log] [tgz] |
|---|---|---|
| author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jan 08 16:33:41 2013 +0000 |
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jan 08 16:33:41 2013 +0000 |
| tree | 50266bd62a39602014455ef04b7b888d1665b6fb | |
| parent | 37924183583cf3fdc59b91de0acc26e1fcf2598d [diff] [blame] |
Fix macro redefinition warning on 10.6 bots in mesa code. R=humper@google.com Review URL: https://codereview.appspot.com/7063050 git-svn-id: http://skia.googlecode.com/svn/trunk@7086 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp b/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp index 2f712e3..1b4b7f6 100644 --- a/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp +++ b/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
@@ -11,7 +11,7 @@ #include "../GrGLUtil.h" #define GL_GLEXT_PROTOTYPES -#include <GL/osmesa.h> +#include "osmesa_wrapper.h" #define GR_GL_GET_PROC(F) interface->f ## F = (GrGL ## F ## Proc) \ OSMesaGetProcAddress("gl" #F);