From 88b9dae63db1269c85e1a9631e29dcf8e4d281ab Mon Sep 17 00:00:00 2001 From: David Carlier Date: Sun, 2 Jul 2017 18:51:10 +0100 Subject: [PATCH] Redefining GLAPIENTRY after inclusion of */gl.h to avoid already defined constant. forgotten constant --- include/GLFW/glfw3.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 382bd4eab..775ce2090 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -107,12 +107,6 @@ 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) @@ -215,6 +209,9 @@ extern "C" { #endif /*__APPLE__*/ #endif /* OpenGL and OpenGL ES headers */ +#ifndef GLAPIENTRY + #define GLAPIENTRY APIENTRY +#endif /* GLAPIENT #if defined(GLFW_INCLUDE_VULKAN)