[Libreoffice-commits] .: 2 commits - bridges/prj sal/osl

[René Engelhard]

 bridges/prj/build.lst |   12 ++++++------
 sal/osl/unx/thread.c  |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 7eff982510bbc98c97ad348b7d2ed1067eb0cf10
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Aug 24 00:29:31 2011 +0200

    add missing depends on br_cppuno_shared for various archs

diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
index 19d529d..4537a5f 100644
--- a/bridges/prj/build.lst
+++ b/bridges/prj/build.lst
@@ -12,13 +12,13 @@ br	bridges\source\cpp_uno\gcc3_aix_powerpc	nmake	-	u	br_gcc3ap br_cppuno_shared
 br	bridges\source\cpp_uno\gcc3_linux_powerpc64	nmake	-	u	br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_mips		nmake	-	u	br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_m68k		nmake	-	u	br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
-br	bridges\source\cpp_uno\gcc3_linux_s390		nmake	-	u	br_gcc3l3 br_unotypes br_inc NULL
-br	bridges\source\cpp_uno\gcc3_linux_s390x		nmake	-	u	br_gcc3l3_64 br_unotypes br_inc NULL
+br	bridges\source\cpp_uno\gcc3_linux_s390		nmake	-	u	br_gcc3l3 br_unotypes br_cppuno_shared br_inc NULL
+br	bridges\source\cpp_uno\gcc3_linux_s390x		nmake	-	u	br_gcc3l3_64 br_unotypes br_cppuno_shared br_inc NULL
 br	bridges\source\cpp_uno\gcc3_linux_sparc		nmake	-	u	br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
-br	bridges\source\cpp_uno\gcc3_linux_arm		nmake	-	u	br_gcc3lr br_unotypes NULL
-br	bridges\source\cpp_uno\gcc3_linux_ia64		nmake	-	u	br_gcc3la br_unotypes NULL
-br	bridges\source\cpp_uno\gcc3_linux_hppa		nmake	-	u	br_gcc3lh br_unotypes NULL
-br	bridges\source\cpp_uno\gcc3_linux_alpha		nmake	-	u	br_gcc3ll br_unotypes NULL
+br	bridges\source\cpp_uno\gcc3_linux_arm		nmake	-	u	br_gcc3lr br_unotypes br_cppuno_shared br_inc NULL
+br	bridges\source\cpp_uno\gcc3_linux_ia64		nmake	-	u	br_gcc3la br_unotypes br_cppuno_shared br_inc NULL
+br	bridges\source\cpp_uno\gcc3_linux_hppa		nmake	-	u	br_gcc3lh br_unotypes br_cppuno_shared br_inc NULL
+br	bridges\source\cpp_uno\gcc3_linux_alpha		nmake	-	u	br_gcc3ll br_unotypes br_cppuno_shared br_inc NULL
 br	bridges\source\cpp_uno\gcc3_macosx_intel			nmake	-	u	br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_macosx_powerpc			nmake	-	u	br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
 br	bridges\source\cpp_uno\gcc3_ios_arm		nmake	-	u	br_gcc3iosr br_cppuno_shared br_unotypes br_inc NULL
commit d419bfc9f7e6114af7461fab17dc0782397e5433
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Aug 24 00:27:00 2011 +0200

    <sys/prctl.h> is not available on kFreeBSD

diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index c8f060f..bfe86f7 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -38,7 +38,7 @@
 #include <rtl/alloc.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
@@ -599,7 +599,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,