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 ++++------
 documentation/src/opengl.dox |  2 +-
 src/gl_draw.cxx              |  8 ++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

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 <OpenGL/gl.h>
+#    if !defined(__gl3_h_) // make sure OpenGL/gl3.h was not included before
+#      include <OpenGL/gl.h>
+#    endif
 #  else
 #    include <GL/gl.h>
 #  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();
diff --git a/documentation/src/opengl.dox b/documentation/src/opengl.dox
index 7b544d2aa..6ab4dc2f7 100644
--- a/documentation/src/opengl.dox
+++ b/documentation/src/opengl.dox
@@ -588,7 +588,7 @@ pacman -S mingw-w64-x86_64-glew
 </ul>
 
 \par  Source-level changes for OpenGL 3:
-\li Put this in all OpenGL-using source files (instead of \#include <FL/gl.h>,
+\li Put this in all OpenGL-using source files (instead of, or before if needed, \#include <FL/gl.h>,
 and before \#include <FL/glut.h> if you use GLUT):
 \code
 #if defined(__APPLE__)
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 16a70a057..35b2007f8 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -225,6 +225,14 @@ void gl_rect(int x, int y, int w, int h) {
   glEnd();
 }
 
+/**
+  Fills the given rectangle with the current color.
+  \see gl_rect(int x, int y, int w, int h)
+  */
+void gl_rectf(int x,int y,int w,int h) {
+  glRecti(x,y,x+w,y+h);
+}
+
 void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) {
   if (!ld) ld = w*d;
   GLint row_length;
-- 
cgit v1.2.3