diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
|---|---|---|
| committer | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
| commit | 34d19da9ffd0571bf16190ec4a16a04bef265900 (patch) | |
| tree | 413690269c5f216194b9a0f72f0438b27ccfd68d /ports/boost-thread/avoid-winapi.patch | |
| parent | b395438c791ca9f78e383a1d571525eee785e67c (diff) | |
| parent | 59a8a9c6248ed230b19028a44484ae5f06db697d (diff) | |
| download | vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.tar.gz vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/boost-thread/avoid-winapi.patch')
| -rw-r--r-- | ports/boost-thread/avoid-winapi.patch | 26 |
1 files changed, 13 insertions, 13 deletions
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 |