commit 7e59eb026b5e9ede5560492def408e65e1c01c20
author Rokas Kupstys <19151258+rokups@users.noreply.github.com> Tue Jul 17 18:17:56 2018 +0300
committer omar <ocornut@users.noreply.github.com> Tue Jul 17 17:17:56 2018 +0200
tree 5a94d09cc7d62f1a71a1dcfc7bd71d498a502eaf
parent 0c207b7bc9bcf62fafb28913246e283137ba1d68

Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 499ac2e..7f5ecc4 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -794,7 +794,9 @@
 #endif
 
 #include "imgui.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include "imgui_internal.h"
 
 #include <ctype.h>      // toupper, isprint

imgui_draw.cpp

diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index a192fff..0f69a82 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -14,7 +14,9 @@
 #endif
 
 #include "imgui.h"
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 #define IMGUI_DEFINE_MATH_OPERATORS
+#endif
 #include "imgui_internal.h"
 
 #include <stdio.h>      // vsnprintf, sscanf, printf