diff --git a/memory/jemalloc/0008-Allow-to-build-with-clang-cl.patch b/memory/jemalloc/0008-Allow-to-build-with-clang-cl.patch new file mode 100644 index 000000000000..09865d3a3b7d --- /dev/null +++ b/memory/jemalloc/0008-Allow-to-build-with-clang-cl.patch @@ -0,0 +1,22 @@ +diff --git a/include/msvc_compat/C99/stdbool.h b/include/msvc_compat/C99/stdbool.h +--- a/include/msvc_compat/C99/stdbool.h ++++ b/include/msvc_compat/C99/stdbool.h +@@ -1,16 +1,18 @@ + #ifndef stdbool_h + #define stdbool_h + + #include + + /* MSVC doesn't define _Bool or bool in C, but does have BOOL */ + /* Note this doesn't pass autoconf's test because (bool) 0.5 != true */ ++#ifndef __clang__ + typedef BOOL _Bool; ++#endif + + #define bool _Bool + #define true 1 + #define false 0 + + #define __bool_true_false_are_defined 1 + + #endif /* stdbool_h */ diff --git a/memory/jemalloc/src/include/msvc_compat/C99/stdbool.h b/memory/jemalloc/src/include/msvc_compat/C99/stdbool.h index da9ee8b809b8..dee22288d4d5 100644 --- a/memory/jemalloc/src/include/msvc_compat/C99/stdbool.h +++ b/memory/jemalloc/src/include/msvc_compat/C99/stdbool.h @@ -5,7 +5,9 @@ /* MSVC doesn't define _Bool or bool in C, but does have BOOL */ /* Note this doesn't pass autoconf's test because (bool) 0.5 != true */ +#ifndef __clang__ typedef BOOL _Bool; +#endif #define bool _Bool #define true 1 diff --git a/memory/jemalloc/update.sh b/memory/jemalloc/update.sh old mode 100644 new mode 100755 index 362fbd6422f9..ad3d0c19aee5 --- a/memory/jemalloc/update.sh +++ b/memory/jemalloc/update.sh @@ -21,6 +21,7 @@ patch -p1 < ../0004-Try-to-use-__builtin_ffsl-if-ffsl-is-unavailable.patch patch -p1 < ../0005-Check-for-__builtin_ffsl-before-ffsl.patch patch -p1 < ../0006-Fix-clang-warnings.patch patch -p1 < ../0007-Ensure-the-default-purgeable-zone-is-after-the-defau.patch +patch -p1 < ../0008-Allow-to-build-with-clang-cl.patch cd .. hg addremove -q src