From 5c3f69da720d283f591f653eccc8ebfac4bca2b6 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 11 Dec 2013 16:00:59 +0000 Subject: main/xulrunner: upgrade to 26.0 --- main/xulrunner/get_nproc.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 main/xulrunner/get_nproc.patch (limited to 'main/xulrunner/get_nproc.patch') 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 - #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 // required for get_nprocs() with uClibc - #include - #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_); -- cgit v1.2.3