Home Explore Help
Sign In
c
/
imgui
mirror of https://github.com/ocornut/imgui.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

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

Rokas Kupstys 7 years ago
parent
0c207b7bc9
commit
7e59eb026b
2 changed files with 4 additions and 0 deletions
Unified View Show Diff Stats
  1. 2 0
      imgui.cpp
  2. 2 0
      imgui_draw.cpp

+ 2 - 0
imgui.cpp
View File 

@@ -794,7 +794,9 @@
 
 #endif
 
 #endif
 
 
 
 #include "imgui.h"
 
 #include "imgui.h"
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 
+#endif
 
 #include "imgui_internal.h"
 
 #include "imgui_internal.h"
 
 
 
 #include <ctype.h>      // toupper, isprint
 
 #include <ctype.h>      // toupper, isprint

+ 2 - 0
imgui_draw.cpp
View File 

@@ -14,7 +14,9 @@
 
 #endif
 
 #endif
 
 
 
 #include "imgui.h"
 
 #include "imgui.h"
 
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 
 #define IMGUI_DEFINE_MATH_OPERATORS
 
+#endif
 
 #include "imgui_internal.h"
 
 #include "imgui_internal.h"
 
 
 
 #include <stdio.h>      // vsnprintf, sscanf, printf
 
 #include <stdio.h>      // vsnprintf, sscanf, printf