Skip to content

Fix PsUnixThread compilation on Android #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.1
Choose a base branch
from
Open

Fix PsUnixThread compilation on Android #293

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions physx/source/foundation/src/unix/PsUnixThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "PsThread.h"

#include <math.h>
#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN
#if !PX_APPLE_FAMILY && !PX_ANDROID && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN
#include <bits/local_lim.h> // PTHREAD_STACK_MIN
#endif
#include <stdio.h>
Expand All @@ -58,7 +58,7 @@
#endif

// fwd
#if defined(ANDROID)
#if PX_ANDROID
extern "C" {
int android_getCpuCount(void);
}
Expand Down Expand Up @@ -194,7 +194,7 @@ void ThreadImpl::start(uint32_t stackSize, Runnable* runnable)
if(stackSize == 0)
stackSize = getDefaultStackSize();

#if defined(PTHREAD_STACK_MIN) && !defined(ANDROID)
#if defined(PTHREAD_STACK_MIN) && !PX_ANDROID
if(stackSize < PTHREAD_STACK_MIN)
{
shdfnd::getFoundation().error(PxErrorCode::eDEBUG_WARNING, __FILE__, __LINE__,
Expand Down Expand Up @@ -271,7 +271,7 @@ __attribute__((noreturn))

void ThreadImpl::kill()
{
#ifndef ANDROID
#if !PX_ANDROID
if(getThread(this)->state == _PxThreadStarted)
pthread_cancel(getThread(this)->thread);
getThread(this)->state = _PxThreadStopped;
Expand Down Expand Up @@ -333,7 +333,7 @@ void ThreadImpl::setName(const char* name)

if (getThread(this)->state == _PxThreadStarted)
{
#if(defined(ANDROID) && (__ANDROID_API__ > 8))
#if (PX_ANDROID && (__ANDROID_API__ > 8))
pthread_setname_np(getThread(this)->thread, name);
#elif PX_PS4
setNamePS4(getThread(this)->thread, name);
Expand Down Expand Up @@ -420,7 +420,7 @@ uint32_t ThreadImpl::getNbPhysicalCores()
int count;
size_t size = sizeof(count);
return sysctlbyname("hw.physicalcpu", &count, &size, NULL, 0) ? 0 : count;
#elif defined(ANDROID)
#elif PX_ANDROID
return android_getCpuCount();
#else
// Linux exposes CPU topology using /sys/devices/system/cpu
Expand Down