1
0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00

Clean up the temporary solution

This conditionally disables specific functions which seem to be
missing in some android NDK versions.
This commit is contained in:
Marvin Scholz 2016-03-16 11:11:18 +01:00
parent 96d0a35f5b
commit bd3b73c2ad

View File

@ -221,10 +221,10 @@ void thread_shutdown(void)
static void _block_signals(void) static void _block_signals(void)
{ {
#ifndef _WIN32 #ifndef _WIN32
#ifndef DISABLE_PTHREAD_BLA #ifndef __ANDROID__
sigset_t ss; sigset_t ss;
//sigfillset(&ss); sigfillset(&ss);
/* These ones we want */ /* These ones we want */
sigdelset(&ss, SIGKILL); sigdelset(&ss, SIGKILL);
@ -249,7 +249,7 @@ static void _block_signals(void)
static void _catch_signals(void) static void _catch_signals(void)
{ {
#ifndef _WIN32 #ifndef _WIN32
#ifndef DISABLE_PTHREAD_BLA #ifndef __ANDROID__
sigset_t ss; sigset_t ss;
sigemptyset(&ss); sigemptyset(&ss);
@ -304,7 +304,7 @@ thread_type *thread_create_c(char *name, void *(*start_routine)(void *),
pthread_attr_setstacksize (&attr, 512*1024); pthread_attr_setstacksize (&attr, 512*1024);
#ifndef DISABLE_PTHREAD_BLA #ifndef __ANDROID__
pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED); pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED);
#endif #endif