فهرست منبع

Undef 'Status' in main header file. (#8751, #8765)

ocornut 4 هفته پیش
والد
کامیت
495d6f1e39
3فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 1 3
      backends/imgui_impl_sdl2.cpp
  2. 1 0
      backends/imgui_impl_vulkan.cpp
  3. 2 0
      imgui.h

+ 1 - 3
backends/imgui_impl_sdl2.cpp

@@ -118,9 +118,7 @@
 #ifdef __EMSCRIPTEN__
 #include <emscripten/em_js.h>
 #endif
-#ifdef Status // X11 headers
-#undef Status
-#endif
+#undef Status // X11 headers are leaking this.
 
 #if SDL_VERSION_ATLEAST(2,0,4) && !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IOS) && !defined(__amigaos4__)
 #define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE    1

+ 1 - 0
backends/imgui_impl_vulkan.cpp

@@ -97,6 +97,7 @@
 #ifndef IM_MAX
 #define IM_MAX(A, B)    (((A) >= (B)) ? (A) : (B))
 #endif
+#undef Status // X11 headers are leaking this.
 
 // Visual Studio warnings
 #ifdef _MSC_VER

+ 2 - 0
imgui.h

@@ -3385,6 +3385,8 @@ struct ImDrawData
 // FOR ALL OTHER ImTextureXXXX TYPES: ONLY CORE LIBRARY AND RENDERER BACKENDS NEED TO KNOW AND CARE ABOUT THEM.
 //-----------------------------------------------------------------------------
 
+#undef Status // X11 headers are leaking this.
+
 // We intentionally support a limited amount of texture formats to limit burden on CPU-side code and extension.
 // Most standard backends only support RGBA32 but we provide a single channel option for low-resource/embedded systems.
 enum ImTextureFormat