[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sal/osl

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Tue Jul 26 21:27:14 PDT 2011


 sal/osl/unx/thread.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7cefc7adb5ad8296f8911e8f39f0f86b23c2040
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jul 26 23:26:25 2011 -0500

    <sys/prctl.h> is not available on k9FreeBSD
    
    Signed-off-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 06730ac..b096011 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -37,7 +37,7 @@
 #include <rtl/textenc.h>
 #include <sal/macros.h>
 
-#if defined LINUX
+#if defined LINUX && ! defined __FreeBSD_kernel__
 #include <sys/prctl.h>
 #ifndef PR_SET_NAME
 #define PR_SET_NAME 15
@@ -598,7 +598,7 @@ void SAL_CALL osl_yieldThread()
 }
 
 void SAL_CALL osl_setThreadName(char const * name) {
-#if defined LINUX
+#if defined LINUX && ! defined __FreeBSD_kernel__
     if (prctl(PR_SET_NAME, (unsigned long) name, 0, 0, 0) != 0) {
         OSL_TRACE(
             "%s prctl(PR_SET_NAME) failed with errno %d", OSL_LOG_PREFIX,


More information about the Libreoffice-commits mailing list