kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #30260
[PATCH] Unconditionally use GLAPIENTRY for GL callback
This is always defined in GL/glew.h, and empty if no special calling
convention is required.
---
common/gal/opengl/utils.cpp | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/common/gal/opengl/utils.cpp b/common/gal/opengl/utils.cpp
index ea6d200f3..5299be16f 100644
--- a/common/gal/opengl/utils.cpp
+++ b/common/gal/opengl/utils.cpp
@@ -83,16 +83,7 @@ int checkGlError( const std::string& aInfo, bool aThrow )
}
-// debugMsgCallback is a callback function for glDebugMessageCallback.
-// It must have a right type on Windows
-#ifdef __WINDOWS__
-#include <windef.h>
-#define CB_TYPE APIENTRY
-#else
-#define CB_TYPE
-#endif
-
-static void CB_TYPE debugMsgCallback( GLenum aSource, GLenum aType, GLuint aId,
+static void GLAPIENTRY debugMsgCallback( GLenum aSource, GLenum aType, GLuint aId,
GLenum aSeverity, GLsizei aLength, const GLchar* aMessage, const void* aUserParam )
{
printf( "%s", aMessage );
Follow ups