diff options
Diffstat (limited to 'meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch')
-rw-r--r-- | meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch new file mode 100644 index 0000000..5c680f6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Thu, 30 Jun 2011 18:29:22 +0200 | ||
3 | Subject: Allow ipc code to build on GNU/kfreebsd | ||
4 | |||
5 | --- | ||
6 | ipc/chromium/src/base/platform_thread_posix.cc | 4 ++++ | ||
7 | ipc/chromium/src/base/third_party/nspr/prcpucfg.h | 2 +- | ||
8 | ipc/chromium/src/build/build_config.h | 2 +- | ||
9 | 3 files changed, 6 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/ipc/chromium/src/base/platform_thread_posix.cc b/ipc/chromium/src/base/platform_thread_posix.cc | ||
12 | index e3f49c7..f1d3b2f 100644 | ||
13 | --- a/ipc/chromium/src/base/platform_thread_posix.cc | ||
14 | +++ b/ipc/chromium/src/base/platform_thread_posix.cc | ||
15 | @@ -37,7 +37,11 @@ PlatformThreadId PlatformThread::CurrentId() { | ||
16 | // TODO(BSD): find a better thread ID | ||
17 | return (intptr_t)(pthread_self()); | ||
18 | #elif defined(OS_LINUX) | ||
19 | +#ifdef __NR_gettid | ||
20 | return syscall(__NR_gettid); | ||
21 | +#else | ||
22 | + return getpid(); | ||
23 | +#endif | ||
24 | #endif | ||
25 | } | ||
26 | |||
27 | diff --git a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
28 | index ef40994..30fef1b 100644 | ||
29 | --- a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
30 | +++ b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
31 | @@ -34,7 +34,7 @@ | ||
32 | #include "base/third_party/nspr/prcpucfg_win.h" | ||
33 | #elif defined(__APPLE__) | ||
34 | #include "base/third_party/nspr/prcpucfg_mac.h" | ||
35 | -#elif defined(__linux__) || defined(ANDROID) | ||
36 | +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) | ||
37 | #include "base/third_party/nspr/prcpucfg_linux.h" | ||
38 | #elif defined(__OpenBSD__) | ||
39 | #include "base/third_party/nspr/prcpucfg_openbsd.h" | ||
40 | diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h | ||
41 | index 0952ab1..4ef0c76 100644 | ||
42 | --- a/ipc/chromium/src/build/build_config.h | ||
43 | +++ b/ipc/chromium/src/build/build_config.h | ||
44 | @@ -17,7 +17,7 @@ | ||
45 | // A set of macros to use for platform detection. | ||
46 | #if defined(__APPLE__) | ||
47 | #define OS_MACOSX 1 | ||
48 | -#elif defined(__linux__) || defined(ANDROID) | ||
49 | +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) | ||
50 | #define OS_LINUX 1 | ||
51 | #elif defined(__OpenBSD__) | ||
52 | #define OS_OPENBSD 1 | ||