From acf7254fe8337e8b06462555d09d6521723c2024 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sun, 27 Nov 2022 08:06:33 +0100 Subject: macOS+OpenGL3: remove "warning: gl.h and gl3.h are both included" --- FL/gl.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'FL') diff --git a/FL/gl.h b/FL/gl.h index a30d2ea75..10eb05e05 100644 --- a/FL/gl.h +++ b/FL/gl.h @@ -55,7 +55,9 @@ # endif # ifdef __APPLE__ // PORTME: OpenGL path abstraction -# include +# if !defined(__gl3_h_) // make sure OpenGL/gl3.h was not included before +# include +# endif # else # include # endif // __APPLE__ // PORTME: OpenGL Path abstraction @@ -68,11 +70,7 @@ FL_EXPORT void gl_color(Fl_Color i); inline void gl_color(int c) {gl_color((Fl_Color)c);} FL_EXPORT void gl_rect(int x,int y,int w,int h); -/** - Fills the given rectangle with the current color. - \see gl_rect(int x, int y, int w, int h) - */ -inline void gl_rectf(int x,int y,int w,int h) {glRecti(x,y,x+w,y+h);} +FL_EXPORT void gl_rectf(int x,int y,int w,int h); FL_EXPORT void gl_font(int fontid, int size); FL_EXPORT int gl_height(); -- cgit v1.2.3