smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

Adjust pthread include, add || defined(__PTW32_VERSION)

Browse source 
Made a new define: OTHER1 , in my config, to not conflict with John E's files. Keeps his build working, while adjusting to mine.

Additionally, vcpkg's pthread includes _ptw32.h, which defines __PTW32_VERSION'.
This commit is contained in:
EZ4Stephen 2025-12-02 20:24:24 +04:00 • committed by GitHub
parent c08531f96e
commit edd526d94b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/pbd/cpus.cc
View file

@ -36,7 +36,11 @@
#include "pbd/cpus.h" #include "pbd/cpus.h"
#if defined(COMPILER_MSVC) && !defined(PTW32_VERSION) #if defined(COMPILER_MSVC) && !defined(PTW32_VERSION)
#ifndef OTHER1
#include <ardourext/pthread.h> // Gets us 'PTW32_VERSION' #include <ardourext/pthread.h> // Gets us 'PTW32_VERSION'
#else
#include <pthread.h> //Gets us '__PTW32_VERSION'
#endif
#endif #endif
int32_t int32_t
@ -69,7 +73,7 @@ PBD::hardware_concurrency()
return c; return c;
} }
} }
#if defined(PTW32_VERSION) || defined(__hpux) #if defined(PTW32_VERSION) || defined(__hpux) || defined(__PTW32_VERSION)
return pthread_num_processors_np(); return pthread_num_processors_np();
#elif defined(__APPLE__) #elif defined(__APPLE__)
int count; int count;