Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows warnings about APIENTRY from GLAD library #2339

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Windows warnings about APIENTRY from GLAD library #2339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf94253
Fix Windows warnings about APIENTRY from GLAD library
totalgee Jan 21, 2025
59c8f7e
Fix GLAD compilation issue on Mac/Linux
totalgee Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions include/glad/glad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,8 @@
#define __gl_h_

#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
#pragma push_macro("APIENTRY")
#define GLAD_PUSHED_APIENTRY
#define APIENTRY __stdcall
#endif

Expand Down Expand Up @@ -14158,4 +14160,9 @@ GLAPI int GLAD_GL_S3_s3tc;
}
#endif

#ifdef GLAD_PUSHED_APIENTRY
#undef GLAD_PUSHED_APIENTRY
#pragma pop_macro("APIENTRY")
#endif // GLAD_PUSHED_APIENTRY

#endif