diff options
| -rw-r--r-- | Source/WebCore/ChangeLog | 14 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/GraphicsTypes3D.h | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 887a5d370..e61637560 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2012-12-10 Jonathan Liu <net147@gmail.com> + + Fix GC3Dintptr and GC3Dsizeiptr typedefs for Win64 + https://bugs.webkit.org/show_bug.cgi?id=104426 + + Reviewed by Simon Hausmann. + + The GC3Dintptr and GC3Dsizeiptr typedefs are incorrect for Win64 as + LLP64 is used there. This would result in compile error due to + narrowing conversion of 64-bit pointer to signed long int which is + 32-bit. + + * platform/graphics/GraphicsTypes3D.h: + 2012-12-11 Jocelyn Turcotte <jocelyn.turcotte@digia.com> [Qt] Fix the inspector not showing up on Windows diff --git a/Source/WebCore/platform/graphics/GraphicsTypes3D.h b/Source/WebCore/platform/graphics/GraphicsTypes3D.h index 303ff8d3f..203a3fd8a 100644 --- a/Source/WebCore/platform/graphics/GraphicsTypes3D.h +++ b/Source/WebCore/platform/graphics/GraphicsTypes3D.h @@ -42,8 +42,8 @@ typedef int GC3Dsizei; typedef unsigned int GC3Duint; typedef float GC3Dfloat; typedef float GC3Dclampf; -typedef signed long int GC3Dintptr; -typedef signed long int GC3Dsizeiptr; +typedef intptr_t GC3Dintptr; +typedef intptr_t GC3Dsizeiptr; typedef char GC3Dchar; typedef GC3Duint Platform3DObject; |