File U_use-correct-include-definitions.patch of Package Mesa.18651

Minimal patchset from the following commit:

https://github.com/mesa3d/mesa/commit/f7d42ee7d319256608ad60778f6787c140badada.patch

reduced to just cover the typedef clash with GLes.

From f7d42ee7d319256608ad60778f6787c140badada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 18 Jul 2018 18:06:37 -0400
Subject: [PATCH] include: update GL & GLES headers (v2)

v2: use correct files

Acked-by: Ian Romanick <ian.d.romanick@intel.com>
---
 include/GL/glcorearb.h |  76 ++++++++++++++++---
 include/GL/glext.h     |  85 +++++++++++++++++++---
 include/GL/glxext.h    |  22 +++++-
 include/GLES2/gl2.h    |   8 +-
 include/GLES2/gl2ext.h | 161 +++++++++++++++++++++++++++++++++++++++--
 include/GLES3/gl3.h    |   8 +-
 6 files changed, 321 insertions(+), 39 deletions(-)

diff --git a/include/GL/glcorearb.h b/include/GL/glcorearb.h
index a78bbb6e182..3cf945c8b20 100644
--- a/include/GL/glcorearb.h
+++ b/include/GL/glcorearb.h
@@ -613,9 +613,9 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode);
 
 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
-#include <stddef.h>
-typedef ptrdiff_t GLsizeiptr;
-typedef ptrdiff_t GLintptr;
+#include <KHR/khrplatform.h>
+typedef khronos_ssize_t GLsizeiptr;
+typedef khronos_intptr_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
 #define GL_QUERY_COUNTER_BITS             0x8864
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -464,9 +464,9 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode);
 
 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
-#include <stddef.h>
-typedef ptrdiff_t GLsizeiptr;
-typedef ptrdiff_t GLintptr;
+#include <KHR/khrplatform.h>
+typedef khronos_ssize_t GLsizeiptr;
+typedef khronos_intptr_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
 #define GL_QUERY_COUNTER_BITS             0x8864
@@ -4718,6 +4718,7 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
 
 #ifndef GL_ARB_vertex_buffer_object
 #define GL_ARB_vertex_buffer_object 1
+#include <stddef.h>
 typedef ptrdiff_t GLsizeiptrARB;
 typedef ptrdiff_t GLintptrARB;
 #define GL_BUFFER_SIZE_ARB                0x8764