From 1bf201ddce12adfd5b06e46b8111b89300d58b4e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 27 Mar 2018 12:56:49 -0600 Subject: [PATCH] glapi: define GL_API to be KEYWORD1 in glapi_dispatch.c (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes a Windows build warning where the prototypes for the ES function in the header file don't match the prototypes in this file because the GL_API and GLAPI macros are defined differently. v2: defined GL_API to KEYWORD1 instead of GLAPI, per Mathias. Reviewed-by: Mathias Fröhlich --- src/mapi/glapi/glapi_dispatch.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c index 323952366d7..ca15449ed01 100644 --- a/src/mapi/glapi/glapi_dispatch.c +++ b/src/mapi/glapi/glapi_dispatch.c @@ -97,6 +97,13 @@ */ #include + +/* Redefine GL_API to avoid MSVC/MinGW warnings about different dllimport + * attributes for these prototypes vs those in the GLES/gl.h header. + */ +#undef GL_API +#define GL_API KEYWORD1 + GL_API void GL_APIENTRY glClearDepthf (GLclampf depth); GL_API void GL_APIENTRY glClipPlanef (GLenum plane, const GLfloat *equation); GL_API void GL_APIENTRY glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); -- 2.30.2