From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 4 Dec 2017 20:33:35 +0000 (+0100)
Subject: Condition for definition of LastIdent must match condition for its use
X-Git-Tag: archive/raspbian/1%6.0.4-1+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2baa29c7bf24f83355fcd59e74425a4494f1f723;p=libreoffice.git

Condition for definition of LastIdent must match condition for its use

Condition for definition of LastIdent must match condition for its use

Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa

Gbp-Pq: Name sal-fix-kfreebsd-build.diff
---

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 639e8b6cec2..affbc5c3fb9 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