From a90ee65f7b0264a672634fc4f5891a2ab57a47ae Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Tue, 8 Nov 2016 12:39:18 +0100 Subject: [PATCH] Add definition of GLAPIENTRY --- README.md | 1 + include/GLFW/glfw3.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 68d257f9..56b03ded 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ information on what to include when reporting a bug. scancodes for keys (#830) - Added `glfwSetWindowMaximizeCallback` and `GLFWwindowmaximizefun` for receiving window maximization events (#778) +- Added definition of `GLAPIENTRY` to public header - Bugfix: Calling `glfwMaximizeWindow` on a full screen window was not ignored - Bugfix: `GLFW_INCLUDE_VULKAN` could not be combined with the corresponding OpenGL and OpenGL ES header macros diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 547b8992..385a0472 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -101,6 +101,12 @@ extern "C" { #endif #endif /* APIENTRY */ +/* Some OpenGL related headers use GLAPIENTRY instead. + */ +#ifndef GLAPIENTRY + #define GLAPIENTRY APIENTRY +#endif /* GLAPIENTRY */ + /* Some Windows OpenGL headers need this. */ #if !defined(WINGDIAPI) && defined(_WIN32)