ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Kill HAVE_PTHREADS."

Browse Source
This commit is contained in:
Yabin Cui 2015-01-27 19:46:54 +00:00 committed by Gerrit Code Review
commit 6e32c0377d
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/binder/IPCThreadState.cpp
View File

@ -29,21 +29,14 @@
#include <private/binder/binder_module.h> #include <private/binder/binder_module.h>
#include <private/binder/Static.h> #include <private/binder/Static.h>
#include <sys/ioctl.h>
#include <signal.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <unistd.h>
#ifdef HAVE_PTHREADS
#include <pthread.h> #include <pthread.h>
#include <sched.h> #include <sched.h>
#include <signal.h>
#include <stdio.h>
#include <sys/ioctl.h>
#include <sys/resource.h> #include <sys/resource.h>
#endif #include <unistd.h>
#ifdef HAVE_WIN32_THREADS
#include <windows.h>
#endif
#if LOG_NDEBUG #if LOG_NDEBUG

5
services/surfaceflinger/main_surfaceflinger.cpp
View File

@ -14,9 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#if defined(HAVE_PTHREADS)
#include <sys/resource.h> #include <sys/resource.h>
#endif
#include <cutils/sched_policy.h> #include <cutils/sched_policy.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
@ -39,9 +37,8 @@ int main(int, char**) {
// instantiate surfaceflinger // instantiate surfaceflinger
sp<SurfaceFlinger> flinger = new SurfaceFlinger(); sp<SurfaceFlinger> flinger = new SurfaceFlinger();
#if defined(HAVE_PTHREADS)
setpriority(PRIO_PROCESS, 0, PRIORITY_URGENT_DISPLAY); setpriority(PRIO_PROCESS, 0, PRIORITY_URGENT_DISPLAY);
#endif
set_sched_policy(0, SP_FOREGROUND); set_sched_policy(0, SP_FOREGROUND);
// initialize before clients can connect // initialize before clients can connect