Update ppapi/lib/gl/include/KHR/khrplatform.h.

Update type definitions in ppapi/lib/gl/include/KHR/khrplatform.h

This fixes building PPAPI examples on Win 64 after (I believe) r242740.

See also: third_party/khronos/KHR/khrplatform.h

BUG=326382
R=bajones@chromium.org, bbudge@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243248

[Bernhard Bauer, 2014-01-06 15:27:39]

Please review.

Example of a build currently failing on the waterfall (see
http://build.chromium.org/p/chromium.lkgr/builders/Win%20x64/builds/1438/step...):

c:\b\build\slave\win_x64\build\src\ppapi\lib\gl\include\gles2\gl2.h(34) :error
C2371: 'GLintptr' : redefinition; different basic types
        c:\b\build\slave\win_x64\build\src\ppapi\c\ppb_opengles2.h(32) : see
declaration of 'GLintptr'
c:\b\build\slave\win_x64\build\src\ppapi\lib\gl\include\gles2\gl2.h(35) :error
C2371: 'GLsizeiptr' : redefinition; different basic types
        c:\b\build\slave\win_x64\build\src\ppapi\c\ppb_opengles2.h(33) : see
declaration of 'GLsizeiptr'

[bajones, 2014-01-06 16:43:34]

On 2014/01/06 15:27:39, Bernhard Bauer wrote:
> Please review.
> 
> Example of a build currently failing on the waterfall (see
>
http://build.chromium.org/p/chromium.lkgr/builders/Win%2520x64/builds/1438/st...:
> 
> c:\b\build\slave\win_x64\build\src\ppapi\lib\gl\include\gles2\gl2.h(34) :error
> C2371: 'GLintptr' : redefinition; different basic types
>         c:\b\build\slave\win_x64\build\src\ppapi\c\ppb_opengles2.h(32) : see
> declaration of 'GLintptr'
> c:\b\build\slave\win_x64\build\src\ppapi\lib\gl\include\gles2\gl2.h(35) :error
> C2371: 'GLsizeiptr' : redefinition; different basic types
>         c:\b\build\slave\win_x64\build\src\ppapi\c\ppb_opengles2.h(33) : see
> declaration of 'GLsizeiptr'

LGTM, this brings the definitions in this file inline with the rest of the
headers.

I apologize that I missed this earlier, but I'm also curious as to why it didn't
cause compile errors on the trybots that I tested on, nor did I see this issue
on my own local win_x64 builds.

[Bernhard Bauer, 2014-01-06 16:57:56]

On 2014/01/06 16:43:34, bajones wrote:
> On 2014/01/06 15:27:39, Bernhard Bauer wrote:
> > Please review.
> > 
> > Example of a build currently failing on the waterfall (see
> >
>
http://build.chromium.org/p/chromium.lkgr/builders/Win%252520x64/builds/1438/...:
> > 
> > c:\b\build\slave\win_x64\build\src\ppapi\lib\gl\include\gles2\gl2.h(34)
:error
> > C2371: 'GLintptr' : redefinition; different basic types
> >         c:\b\build\slave\win_x64\build\src\ppapi\c\ppb_opengles2.h(32) : see
> > declaration of 'GLintptr'
> > c:\b\build\slave\win_x64\build\src\ppapi\lib\gl\include\gles2\gl2.h(35)
:error
> > C2371: 'GLsizeiptr' : redefinition; different basic types
> >         c:\b\build\slave\win_x64\build\src\ppapi\c\ppb_opengles2.h(33) : see
> > declaration of 'GLsizeiptr'
> 
> LGTM, this brings the definitions in this file inline with the rest of the
> headers.
> 
> I apologize that I missed this earlier, but I'm also curious as to why it
didn't
> cause compile errors on the trybots that I tested on, nor did I see this issue
> on my own local win_x64 builds.

Hm... you could try building ppapi_example_gles2 (with and without the patch)? I
don't have a Windows machine to test it myself, sadly.

[commit-bot: I haz the power, 2014-01-06 16:58:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/125013002/80001

[commit-bot: I haz the power, 2014-01-06 17:13:40]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[Bernhard Bauer, 2014-01-06 18:00:44]

Bill, can I get an OWNERS review?

[bbudge, 2014-01-06 18:18:38]

lgtm

[commit-bot: I haz the power, 2014-01-06 18:29:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bauerb@chromium.org/125013002/80001

[commit-bot: I haz the power, 2014-01-06 18:48:56]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[Bernhard Bauer, 2014-01-07 10:52:28]

Committed patchset #2 manually as r243248 (presubmit successful).