am 39d890d9: am 6e32c037: Merge "Kill HAVE_PTHREADS."

* commit '39d890d9aed5cb07b8a166a749299b9d24d8f137':
  Kill HAVE_PTHREADS.
This commit is contained in:
Yabin Cui 2015-01-27 23:42:55 +00:00 committed by Android Git Automerger
commit 3d6c569140
2 changed files with 5 additions and 15 deletions

View File

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

View File

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