From c9bb34f3300fac0a604b4d65556d736340bab7c8 Mon Sep 17 00:00:00 2001 From: Christoph Goehre Date: Wed, 31 Oct 2012 13:27:07 -0400 Subject: [PATCH] ipc/chromium: fix #if define() for kFreeBSD and Hurd The kFreeBSD and Hurd platforms need some other macros to include the correct needed headers. Depended on this some minor changes to call the correct functions also needed. Also the list of the cpp source file for the chromium things needs to expanded. The changes is an adoption of the previous dropped patch 'Fix ipc/chromium on kFreeBSD and Hurd' from the version 17. Gbp-Pq: Topic porting-kfreebsd-hurd Gbp-Pq: Name ipc-chromium-fix-if-define-for-kFreeBSD-and-Hurd.patch --- ipc/chromium/src/base/platform_thread_posix.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ipc/chromium/src/base/platform_thread_posix.cc b/ipc/chromium/src/base/platform_thread_posix.cc index 481549eabb..5f9108d2b0 100644 --- a/ipc/chromium/src/base/platform_thread_posix.cc +++ b/ipc/chromium/src/base/platform_thread_posix.cc @@ -13,16 +13,19 @@ #include #elif defined(OS_NETBSD) #include -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) #include #include +//#elif defined(OS_FREEBSD) && !defined(__FreeBSD_kernel__) +//#include +//#include #endif #if !defined(OS_MACOSX) #include #endif -#if defined(OS_BSD) && !defined(OS_NETBSD) && !defined(__GLIBC__) +#if !defined(OS_BSD) && !defined(NetBSD) && !defined(__FreeBSD_kernel__) && !defined(__GLIBC__) #include #endif @@ -102,7 +105,7 @@ void PlatformThread::SetName(const char* name) { // Note that glibc also has a 'pthread_setname_np' api, but it may not be // available everywhere and it's only benefit over using prctl directly is // that it can set the name of threads other than the current thread. -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); #elif defined(OS_NETBSD) pthread_setname_np(pthread_self(), "%s", (void *)name); -- 2.30.2