diff options
| author | martin-s <webmaster@macside.net> | 2017-11-05 19:13:16 +0100 |
|---|---|---|
| committer | martin-s <webmaster@macside.net> | 2017-11-05 19:13:16 +0100 |
| commit | d5a7da6bcb92b551d6f8a9a321deb063f6632dbc (patch) | |
| tree | 9dfef57f1fb3611bde577cab7b9dee9411ffb041 /ports/folly/fix-malloc.diff | |
| parent | c6d69fac625706c52fc8e48615bc0c6d7b8dad25 (diff) | |
| parent | 330b8d8bab6a3d07165bf7c05fea09a8e0d56348 (diff) | |
| download | vcpkg-d5a7da6bcb92b551d6f8a9a321deb063f6632dbc.tar.gz vcpkg-d5a7da6bcb92b551d6f8a9a321deb063f6632dbc.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013
# Conflicts:
# scripts/cmake/vcpkg_configure_cmake.cmake
# toolsrc/src/vcpkg/vcpkgpaths.cpp
Diffstat (limited to 'ports/folly/fix-malloc.diff')
| -rw-r--r-- | ports/folly/fix-malloc.diff | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ports/folly/fix-malloc.diff b/ports/folly/fix-malloc.diff new file mode 100644 index 000000000..db7a23063 --- /dev/null +++ b/ports/folly/fix-malloc.diff @@ -0,0 +1,12 @@ +--- a/folly/Malloc.h Mon Oct 09 04:35:09 2017 ++++ b/folly/Malloc.h Fri Oct 13 15:31:36 2017 +@@ -189,9 +189,6 @@ + return false; + } + +- /* Avoid optimizing away the malloc. */ +- asm volatile("" ::"m"(ptr) : "memory"); +- + return (origAllocated != *counter); + }(); + |