merge, r=backout
authorJim Mathies <jmathies@mozilla.com>
Tue, 24 Jul 2012 15:29:53 -0500
changeset 105804 dece3f1a042039167c05cb9b706b17e6d03d6907
parent 105802 0dce81ba06937df991f677f9d7640701daea9b19 (current diff)
parent 105803 2cb7b59a87d0373493d00c82f01b2a59690c68b1 (diff)
child 105805 21f18a7f5f9dabda3fb0d5ee2367af311e3b9e5a
push idunknown
push userunknown
push dateunknown
reviewersbackout
milestone17.0a1
merge, r=backout
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -47,17 +47,17 @@ namespace mozilla {
   namespace layers {
     class LayerManagerOGL;
     class ColorTextureLayerProgram;
   }
 
 namespace gl {
 class GLContext;
 
-typedef void* SharedTextureHandle;
+typedef uintptr_t SharedTextureHandle;
 
 enum ShaderProgramType {
     RGBALayerProgramType,
     RGBALayerExternalProgramType,
     BGRALayerProgramType,
     RGBXLayerProgramType,
     BGRXLayerProgramType,
     RGBARectLayerProgramType,