Add POCO_OS_ANDROID as platfrom definitons (#2186)

* Add POCO_OS_ANDROID as platform definition

* Ignore test big ping when its failing
This commit is contained in:
Joerg-Christian Boehme
2018-02-27 02:18:45 +01:00
committed by Aleksandar Fabijanic
parent 9feabc7723
commit 73897b4357
21 changed files with 35 additions and 30 deletions

View File

@@ -63,7 +63,7 @@ SERVICE_STATUS ServerApplication::_serviceStatus;
SERVICE_STATUS_HANDLE ServerApplication::_serviceStatusHandle = 0;
#endif
#endif
#if defined(POCO_VXWORKS) || defined(POCO_ANDROID)
#if defined(POCO_VXWORKS) || POCO_OS == POCO_OS_ANDROID
Poco::Event ServerApplication::_terminate;
#endif
@@ -101,7 +101,7 @@ void ServerApplication::terminate()
{
#if defined(POCO_OS_FAMILY_WINDOWS)
_terminate.set();
#elif defined(POCO_VXWORKS) || defined(POCO_ANDROID)
#elif defined(POCO_VXWORKS) || POCO_OS == POCO_OS_ANDROID
_terminate.set();
#else
Poco::Process::requestTermination(Process::id());
@@ -569,7 +569,7 @@ void ServerApplication::defineOptions(OptionSet& options)
//
void ServerApplication::waitForTerminationRequest()
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
sigset_t sset;
sigemptyset(&sset);
if (!std::getenv("POCO_ENABLE_DEBUGGER"))
@@ -581,7 +581,7 @@ void ServerApplication::waitForTerminationRequest()
sigprocmask(SIG_BLOCK, &sset, NULL);
int sig;
sigwait(&sset, &sig);
#else // POCO_ANDROID
#else // POCO_OS != POCO_OS_ANDROID
_terminate.wait();
#endif
}