[Libreoffice-commits] .: sal/inc

[Libreoffice Gerrit user]

 sal/inc/osl/interlck.h |    4 ----
 sal/inc/sal/config.h   |    2 --
 2 files changed, 6 deletions(-)

New commits:
commit 6adc24cd861cdde45d8f55943a836246470fa72c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Nov 15 18:07:06 2012 +0100

    Revert "use intrinsict to inline InterlockCount() on Windows too"
    
    This reverts commit 5ae27819974e3492b6f4d33fa51ef2a9d77b5ce5.
    
    The commit breaks smoketest on Windows, for reasons unknown:
    C:/cygwin/home/tinderbox/tinderbox-master-build-libreoffice/smoketest/smoketest.cxx(197) : error : Assertion
    Test name: `anonymous namespace'::Test::test
    assertion failed
    - Expression: connection_.isStillAlive()
    
    I can't see why the commit should matter, given that the functions
    should be equivalent according to my reading of the docs. And debugging
    this on Windows is pain squared, so I can't even figure out what is
    going wrong where. Feel free to try your luck.
    
    Note that when debugging this, the code triggering this seems to be
    run only if SOLAR_JAVA and JAVA_HOME are set, so 'make verbose=t'
    and running just the command without this hides the problem.

diff --git a/sal/inc/osl/interlck.h b/sal/inc/osl/interlck.h
index 22ff985..792ea55 100644
--- a/sal/inc/osl/interlck.h
+++ b/sal/inc/osl/interlck.h
@@ -67,8 +67,6 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 */
 #if defined( HAVE_GCC_BUILTIN_ATOMIC )
 #    define osl_atomic_increment(p)  __sync_add_and_fetch((p), 1)
-#elif defined( _MSC_VER )
-#    define osl_atomic_increment(p) _InterlockedIncrement((p))
 #else
 #    define osl_atomic_increment(p) osl_incrementInterlockedCount((p))
 #endif
@@ -86,8 +84,6 @@ SAL_DLLPUBLIC oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInte
 */
 #if defined( HAVE_GCC_BUILTIN_ATOMIC )
 #    define osl_atomic_decrement(p) __sync_sub_and_fetch((p), 1)
-#elif defined( _MSC_VER )
-#    define osl_atomic_decrement(p) _InterlockedDecrement((p))
 #else
 #    define osl_atomic_decrement(p) osl_decrementInterlockedCount((p))
 #endif
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index e81250a..aee8e82 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -44,8 +44,6 @@
 
 #ifdef _MSC_VER
 
-#include <Intrin.h> // define intrinsic functions supported by the compiler
-
 #ifndef _USE_MATH_DEFINES
 #define _USE_MATH_DEFINES // needed by Visual C++ for math constants
 #endif