diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-12-11 16:00:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-12-11 16:00:59 +0000 |
| commit | 5c3f69da720d283f591f653eccc8ebfac4bca2b6 (patch) | |
| tree | a047d48d57183f99b38d7f1caa91709fc7f5e5b3 /main/xulrunner/get_nproc.patch | |
| parent | b5f74a0dd2498a03f6c34ca452cd069d2b3a838e (diff) | |
| download | aports-5c3f69da720d283f591f653eccc8ebfac4bca2b6.tar.bz2 aports-5c3f69da720d283f591f653eccc8ebfac4bca2b6.tar.xz | |
main/xulrunner: upgrade to 26.0
Diffstat (limited to 'main/xulrunner/get_nproc.patch')
| -rw-r--r-- | main/xulrunner/get_nproc.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/main/xulrunner/get_nproc.patch b/main/xulrunner/get_nproc.patch deleted file mode 100644 index 7f97ff7078..0000000000 --- a/main/xulrunner/get_nproc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-10-25 22:27:35.000000000 +0000 -+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-10-29 10:10:33.578900357 +0000 -@@ -17,7 +17,7 @@ - #include <sys/sysctl.h> - #elif defined(WEBRTC_ANDROID) - // Not implemented yet, might be possible to use Linux implementation --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) && !defined(__UCLIBC__) - #include <unistd.h> // required for get_nprocs() with uClibc - #include <sys/sysinfo.h> - #else // defined(_SC_NPROCESSORS_ONLN) -@@ -39,7 +39,7 @@ - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - --#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) -+#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) && defined(__GLIBC__) && !defined(__UCLIBC__) - number_of_cores_ = get_nprocs(); - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); |
