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 1 commit 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
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions include/glad/glad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,9 @@
#ifndef __glad_h_
#define __glad_h_

#pragma push_macro("APIENTRY")


#ifdef __gl_h_
#error OpenGL header already included, remove this include, glad already provides it
#endif
Expand Down Expand Up @@ -14158,4 +14161,6 @@ GLAPI int GLAD_GL_S3_s3tc;
}
#endif

#pragma pop_macro("APIENTRY")

#endif
Loading