Mercurial > mxe-octave

annotate src/boost-1-intrinsics-fix.patch @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents 5a459f007b2f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3642
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
1 This file is part of MXE.
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
2 See index.html for further information.
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
3
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
4 This patch has been taken from:
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
5 http://pkgs.fedoraproject.org/cgit/mingw-boost.git/plain/boost-include-intrin-h-on-mingw-w64.patch
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
6
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
7 --- a/boost/detail/interlocked.hpp.interlocked 2012-12-11 15:42:26.000000000 +0100
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
8 +++ b/boost/detail/interlocked.hpp 2013-07-21 15:22:56.082346444 +0200
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
9 @@ -69,9 +69,9 @@
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
10 # define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
11 ((void*)BOOST_INTERLOCKED_EXCHANGE((long*)(dest),(long)(exchange)))
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
12
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
13 -#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
14 +#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) || defined( __MINGW64_VERSION_MAJOR )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
15
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
16 -#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1600
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
17 +#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1600 ) || defined( __MINGW64_VERSION_MAJOR )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
18
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
19 #include <intrin.h>
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
20
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
21 @@ -93,12 +93,16 @@
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
22
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
23 #endif
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
24
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
25 +# if defined( BOOST_MSVC )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
26 +
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
27 # pragma intrinsic( _InterlockedIncrement )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
28 # pragma intrinsic( _InterlockedDecrement )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
29 # pragma intrinsic( _InterlockedCompareExchange )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
30 # pragma intrinsic( _InterlockedExchange )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
31 # pragma intrinsic( _InterlockedExchangeAdd )
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
32
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
33 +# endif
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
34 +
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
35 # if defined(_M_IA64) || defined(_M_AMD64)
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
36
5a459f007b2f boost: update to 1.53.0
John Donoghue
parents:
diff changeset
37 extern "C" void* __cdecl _InterlockedCompareExchangePointer( void* volatile *, void*, void* );