diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-29 10:45:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-29 10:45:51 +0000 |
| commit | 0922448fd990acf0b61c0f147d82a67a1bd7a852 (patch) | |
| tree | f960826a7140f994e4e0025436b136d7c2b92239 /main/xulrunner/get_nproc.patch | |
| parent | 355e7462540d7f04d77602bac7eab4c8fa0eb3a9 (diff) | |
| download | aports-0922448fd990acf0b61c0f147d82a67a1bd7a852.tar.bz2 aports-0922448fd990acf0b61c0f147d82a67a1bd7a852.tar.xz | |
main/xulrunner: upgrade to 25.0
Diffstat (limited to 'main/xulrunner/get_nproc.patch')
| -rw-r--r-- | main/xulrunner/get_nproc.patch | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/main/xulrunner/get_nproc.patch b/main/xulrunner/get_nproc.patch index 6ee7fd3233..7f97ff7078 100644 --- a/main/xulrunner/get_nproc.patch +++ b/main/xulrunner/get_nproc.patch @@ -1,15 +1,15 @@ ---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-09-17 09:50:51.299150776 +0200 -+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-09-17 10:16:45.749663438 +0200 +--- ./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) - #include <unistd.h> -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", number_of_cores_); @@ -18,12 +18,3 @@ number_of_cores_ = get_nprocs(); WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", number_of_cores_); -@@ -64,7 +64,7 @@ - number_of_cores_ = 1; - } - #elif defined(_SC_NPROCESSORS_ONLN) -- _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN); -+ number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN); - #else - WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1, - "No function to get number of cores"); |