From 7e59eb026b5e9ede5560492def408e65e1c01c20 Mon Sep 17 00:00:00 2001 From: Rokas Kupstys <19151258+rokups@users.noreply.github.com> Date: Tue, 17 Jul 2018 18:17:56 +0300 Subject: [PATCH] Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950) --- imgui.cpp | 2 ++ imgui_draw.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/imgui.cpp b/imgui.cpp index 499ac2eae..7f5ecc402 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 // toupper, isprint diff --git a/imgui_draw.cpp b/imgui_draw.cpp index a192fff44..0f69a82b2 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 // vsnprintf, sscanf, printf