diff options
| author | myd7349 <myd7349@gmail.com> | 2019-06-14 07:55:33 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-06-14 07:55:33 +0800 |
| commit | 1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17 (patch) | |
| tree | 284efa9cf01657928d184e194a39e7cdee682e04 /ports/boost-thread | |
| parent | 7cd35529736837e2e74dad231717bda76327ac79 (diff) | |
| parent | b03f62e0ebc1b5515bc8a1f41f3bfe9eca6589d4 (diff) | |
| download | vcpkg-1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17.tar.gz vcpkg-1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'ports/boost-thread')
| -rw-r--r-- | ports/boost-thread/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-thread/avoid-winapi.patch | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index a21747a08..41f0d4066 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-thread
-Version: 1.70.0
+Version: 1.70.0-1
Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
Description: Boost thread module
diff --git a/ports/boost-thread/avoid-winapi.patch b/ports/boost-thread/avoid-winapi.patch index ed6a89ee7..2308600ea 100644 --- a/ports/boost-thread/avoid-winapi.patch +++ b/ports/boost-thread/avoid-winapi.patch @@ -1,13 +1,13 @@ -diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
-index 5e378f7..6144621 100644
---- a/include/boost/thread/win32/thread_primitives.hpp
-+++ b/include/boost/thread/win32/thread_primitives.hpp
-@@ -70,7 +70,7 @@ namespace boost
- {
- namespace win32
- {
-- namespace detail { typedef ticks_type (WINAPI *gettickcount64_t)(); }
-+ namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
- extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
-
- enum event_type
+diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp +index e075140..d60ab36 100644 +--- a/include/boost/thread/win32/thread_primitives.hpp ++++ b/include/boost/thread/win32/thread_primitives.hpp +@@ -70,7 +70,7 @@ namespace boost + { + namespace win32 + { +- namespace detail { typedef ticks_type (BOOST_WINAPI_WINAPI_CC *gettickcount64_t)(); } ++ namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); } + extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64; + + enum event_type |