[Libreoffice-commits] core.git: include/osl

Noel Grandin noel at peralex.com
Tue Dec 1 23:47:13 PST 2015


 include/osl/interlck.h |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit e82ca698ecdf7f73f6d0bf2974c19beade0f09cc
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Dec 1 07:58:12 2015 +0200

    use compiler intrinsic for osl_atomic_increment on Windows
    
    Change-Id: I66b2ba5d8e419f6af5eb3f85f8c12effcdaf4d5e
    Reviewed-on: https://gerrit.libreoffice.org/20319
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index 925e5f2..85da298 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -25,6 +25,10 @@
 #include <sal/saldllapi.h>
 #include <sal/types.h>
 
+#if defined WNT
+#include <intrin.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -58,6 +62,8 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 */
 #if HAVE_GCC_BUILTIN_ATOMIC
 #    define osl_atomic_increment(p)  __sync_add_and_fetch((p), 1)
+#elif defined WNT
+#    define osl_atomic_increment(p)  _InterlockedIncrement(p)
 #else
 #    define osl_atomic_increment(p) osl_incrementInterlockedCount((p))
 #endif
@@ -75,6 +81,8 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 */
 #if HAVE_GCC_BUILTIN_ATOMIC
 #    define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1)
+#elif defined WNT
+#    define osl_atomic_decrement(p)  _InterlockedDecrement(p)
 #else
 #    define osl_atomic_decrement(p) osl_decrementInterlockedCount((p))
 #endif


More information about the Libreoffice-commits mailing list