1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-10-08 07:07:25 -04:00
Related to #1039.
This commit is contained in:
Camilla Löwy 2017-07-03 14:25:47 +02:00
parent 57f872054c
commit be51c201dd
2 changed files with 8 additions and 3 deletions

View File

@ -248,6 +248,7 @@ skills.
- blanco - blanco
- Kyle Brenneman - Kyle Brenneman
- Martin Capitanio - Martin Capitanio
- David Carlier
- Chi-kwan Chan - Chi-kwan Chan
- Lambert Clara - Lambert Clara
- Andrew Corrigan - Andrew Corrigan

View File

@ -209,9 +209,6 @@ extern "C" {
#endif /*__APPLE__*/ #endif /*__APPLE__*/
#endif /* OpenGL and OpenGL ES headers */ #endif /* OpenGL and OpenGL ES headers */
#ifndef GLAPIENTRY
#define GLAPIENTRY APIENTRY
#endif /* GLAPIENT
#if defined(GLFW_INCLUDE_VULKAN) #if defined(GLFW_INCLUDE_VULKAN)
@ -4909,6 +4906,13 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window
#undef GLFW_CALLBACK_DEFINED #undef GLFW_CALLBACK_DEFINED
#endif #endif
/* Some OpenGL related headers need GLAPIENTRY, but it is unconditionally
* defined by some gl.h variants (OpenBSD) so define it after if needed.
*/
#ifndef GLAPIENTRY
#define GLAPIENTRY APIENTRY
#endif
/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */ /* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */