forked from bartvdbraak/blender
Fix Carve compilation on FreeBSD
Based on the patch from Marcus von Appen, thanks!
This commit is contained in:
parent
a628ca9ebe
commit
dc71cb5f6e
7
extern/carve/lib/triangulator.cpp
vendored
7
extern/carve/lib/triangulator.cpp
vendored
@ -27,6 +27,13 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
// Support for latest Clang/LLVM on FreeBSD which does have different libcxx.
|
||||
//
|
||||
// TODO(sergey): Move it some some more generic header with platform-specific
|
||||
// declarations.
|
||||
#ifdef _LIBCPP_VERSION
|
||||
# define __is_heap is_heap
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
// private code related to hole patching.
|
||||
|
17
extern/carve/patches/clang_is_heap_fix.patch
vendored
Normal file
17
extern/carve/patches/clang_is_heap_fix.patch
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
diff -r 2e6e59022e6e lib/triangulator.cpp
|
||||
--- a/lib/triangulator.cpp Fri Nov 09 09:35:35 2012 +1100
|
||||
+++ b/lib/triangulator.cpp Thu Nov 28 13:34:52 2013 +0600
|
||||
@@ -27,6 +27,13 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
+// Support for latest Clang/LLVM on FreeBSD which does have different libcxx.
|
||||
+//
|
||||
+// TODO(sergey): Move it some some more generic header with platform-specific
|
||||
+// declarations.
|
||||
+#ifdef _LIBCPP_VERSION
|
||||
+# define __is_heap is_heap
|
||||
+#endif
|
||||
|
||||
namespace {
|
||||
// private code related to hole patching.
|
1
extern/carve/patches/series
vendored
1
extern/carve/patches/series
vendored
@ -3,3 +3,4 @@ win32.patch
|
||||
mesh_iterator.patch
|
||||
mingw.patch
|
||||
gcc46.patch
|
||||
clang_is_heap_fix.patch
|
||||
|
Loading…
Reference in New Issue
Block a user