diff options
| author | Brian Paul <[email protected]> | 2018-03-27 12:56:49 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-03-30 14:33:33 -0600 |
| commit | 1bf201ddce12adfd5b06e46b8111b89300d58b4e (patch) | |
| tree | 3891ee09e62fa8f8427cd72ee15a2ce92fbda513 /src | |
| parent | 26bc983c8374fd98dc3b8f8fa273f3063e3ac249 (diff) | |
glapi: define GL_API to be KEYWORD1 in glapi_dispatch.c (v2)
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 <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/glapi_dispatch.c | 7 |
1 files changed, 7 insertions, 0 deletions
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 <GLES/glplatform.h> + +/* 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); |