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