diff options
| author | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
|---|---|---|
| committer | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
| commit | b3caf67749f21952e0157ba77ece755aa01b254a (patch) | |
| tree | dff6a178b506fdc58e28bbc9094f1687eb99bd72 /ports/boost-asio/windows_alloca_header.patch | |
| parent | fddebb75da034752fb267ba121497ba58157bb79 (diff) | |
| parent | 618fa203c13c30bd19826988cff66481bca0562f (diff) | |
| download | vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.tar.gz vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.zip | |
Merge branch 'trunk' into parallel-file-ops
Diffstat (limited to 'ports/boost-asio/windows_alloca_header.patch')
| -rw-r--r-- | ports/boost-asio/windows_alloca_header.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ports/boost-asio/windows_alloca_header.patch b/ports/boost-asio/windows_alloca_header.patch new file mode 100644 index 000000000..609e1ebfe --- /dev/null +++ b/ports/boost-asio/windows_alloca_header.patch @@ -0,0 +1,15 @@ +diff --git a/include/boost/asio/detail/impl/socket_ops.ipp b/include/boost/asio/detail/impl/socket_ops.ipp +index 7d7c31f..d2cd468 100644 +--- a/include/boost/asio/detail/impl/socket_ops.ipp ++++ b/include/boost/asio/detail/impl/socket_ops.ipp +@@ -27,6 +27,10 @@ + #include <boost/asio/detail/socket_ops.hpp> + #include <boost/asio/error.hpp> + ++#if defined(BOOST_ASIO_WINDOWS) ++#include <malloc.h> ++#endif ++ + #if defined(BOOST_ASIO_WINDOWS_RUNTIME) + # include <codecvt> + # include <locale> |