mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 16:40:31 -04:00
79e5fba255
PR: 272730 Reported by: michal.zielonka.8001@gmail.com Approved by: teodorsigaev@gmail.com (maintainer)
11 lines
485 B
C++
11 lines
485 B
C++
--- src/slic3r/GUI/GLCanvas3D.cpp.orig 2023-07-25 09:31:07 UTC
|
|
+++ src/slic3r/GUI/GLCanvas3D.cpp
|
|
@@ -97,7 +97,7 @@ float RetinaHelper::get_scale_factor() { return float(
|
|
#endif // __WXGTK3__
|
|
|
|
// Fixed the collision between BuildVolume::Type::Convex and macro Convex defined inside /usr/include/X11/X.h that is included by WxWidgets 3.0.
|
|
-#if defined(__linux__) && defined(Convex)
|
|
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(Convex)
|
|
#undef Convex
|
|
#endif
|
|
|