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

Stephan Bergmann sbergman at redhat.com
Mon Dec 4 21:54:25 UTC 2017


 sal/osl/unx/thread.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa0b08980aba7bc82ab75151129b0c643cde7dfa
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Dec 4 22:33:35 2017 +0100

    Condition for definition of LastIdent must match condition for its use
    
    Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa
    Reviewed-on: https://gerrit.libreoffice.org/45829
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 639e8b6cec26..affbc5c3fb9c 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -567,7 +567,7 @@ static int HashSize = SAL_N_ELEMENTS(HashTable);
 
 static pthread_mutex_t HashLock = PTHREAD_MUTEX_INITIALIZER;
 
-#if ! (defined LINUX || defined MACOSX || defined IOS)
+#if ! ((defined LINUX && !defined __FreeBSD_kernel__) || defined MACOSX || defined IOS)
 static oslThreadIdentifier LastIdent = 0;
 #endif
 


More information about the Libreoffice-commits mailing list