summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYonggang Luo <luoyonggang@gmail.com>2022-11-03 00:04:55 +0800
committerMarge Bot <emma+marge@anholt.net>2022-11-03 16:07:31 +0000
commit7b7bbe871c067d1dfdb4fe4adfc0f38d051fe04c (patch)
tree9f1265d64737705191f5df005f77f8613c1ec167 /include
parent147a491a74d0f588b724759d86bde08a96ab1858 (diff)
downloadmesa-7b7bbe871c067d1dfdb4fe4adfc0f38d051fe04c.tar.gz
mesa: sync GLAPIENTRY with KHRONOS_APIENTRY in GL/gl.h
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Acked-by: Brian Paul brianp@vmware.com Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19472>
Diffstat (limited to 'include')
-rw-r--r--include/GL/gl.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index b18360c3457..88efd27288e 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -37,10 +37,11 @@
#if defined(__WIN32__) && !defined(__CYGWIN__)
# define GLAPI extern
-# if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
-# define GLAPIENTRY
-# else
+# if !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+ /* Win32 but not WinCE */
# define GLAPIENTRY __stdcall
+# else
+# define GLAPIENTRY
# endif
#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
# define GLAPI extern