From 4858776205e31263a709a1d25c9eaac33f8741f6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 20 Oct 2014 15:42:22 +0900 Subject: [PATCH] Evas GL: Fix compilation on some platforms Damn these OpenGL headers and their typedefs! --- src/lib/evas/Evas_GL.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h index 65db1c22ad..5f2a8d1f71 100644 --- a/src/lib/evas/Evas_GL.h +++ b/src/lib/evas/Evas_GL.h @@ -879,10 +879,6 @@ typedef float GLfloat; // Changed khronos_float_t typedef float GLclampf; // Changed khronos_float_t typedef signed int GLfixed; // Changed khronos_int32_t -/* GL types for handling large vertex buffer objects */ -typedef signed long int GLintptr; // Changed khronos_intptr_t -typedef signed long int GLsizeiptr; // Changed khronos_ssize_t - /* OpenGL ES core versions */ //#define GL_ES_VERSION_2_0 1 @@ -3443,6 +3439,12 @@ typedef signed long int GLsizeiptr; // Changed khronos_ssize_t # endif #endif +#ifndef GL_ES_VERSION_2_0 +/* GL types for handling large vertex buffer objects */ +#include +typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t +typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t +#endif /* Some definitions from GLES 3.0. * Note: Evas_GL does NOT support GLES 3.