Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redefining GLAPIENTRY after inclusion of */gl.h

Browse Source 
to avoid already defined constant.

forgotten constant
This commit is contained in:
David Carlier 2017-07-02 18:51:10 +01:00
parent 9610d68f19
commit 88b9dae63d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/GLFW/glfw3.h
View File

@ -107,12 +107,6 @@ extern "C" {
#endif #endif
#endif /* APIENTRY */ #endif /* APIENTRY */
/* Some OpenGL related headers use GLAPIENTRY instead.
*/
#ifndef GLAPIENTRY
#define GLAPIENTRY APIENTRY
#endif /* GLAPIENTRY */
/* Some Windows OpenGL headers need this. /* Some Windows OpenGL headers need this.
*/ */
#if !defined(WINGDIAPI) && defined(_WIN32) #if !defined(WINGDIAPI) && defined(_WIN32)
@ -215,6 +209,9 @@ 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)