commit d3212482fe6e158db71999ae84de754f908ab8fd
author Matt Haynie <mrhaynie@live.com> Thu Apr 23 13:58:45 2020 -0700
committer GitHub <noreply@github.com> Thu Apr 23 22:58:45 2020 +0200
tree 97036f1802646a481ffd42251ee6ed0c574d3bda
parent 5ac5d3674fc79bfb41634df6ce412eb9bc098453

Fix multiple macro definitions of GLFW_INCLUDE_NONE (#3157)

examples/imgui_impl_opengl3.cpp

diff --git a/examples/imgui_impl_opengl3.cpp b/examples/imgui_impl_opengl3.cpp
index bf8225d..c60df73 100644
--- a/examples/imgui_impl_opengl3.cpp
+++ b/examples/imgui_impl_opengl3.cpp
@@ -121,12 +121,16 @@
 #elif defined(IMGUI_IMPL_OPENGL_LOADER_GLAD)
 #include <glad/glad.h>          // Needs to be initialized with gladLoadGL() in user's code.
 #elif defined(IMGUI_IMPL_OPENGL_LOADER_GLBINDING2)
+#ifndef GLFW_INCLUDE_NONE
 #define GLFW_INCLUDE_NONE       // GLFW including OpenGL headers causes ambiguity or multiple definition errors.
+#endif
 #include <glbinding/Binding.h>  // Needs to be initialized with glbinding::Binding::initialize() in user's code.
 #include <glbinding/gl/gl.h>
 using namespace gl;
 #elif defined(IMGUI_IMPL_OPENGL_LOADER_GLBINDING3)
+#ifndef GLFW_INCLUDE_NONE
 #define GLFW_INCLUDE_NONE       // GLFW including OpenGL headers causes ambiguity or multiple definition errors.
+#endif
 #include <glbinding/glbinding.h>// Needs to be initialized with glbinding::initialize() in user's code.
 #include <glbinding/gl/gl.h>
 using namespace gl;