Skip to content

Commit

Permalink
Extras/VHACD/inc/vhacdMutex.h: fix musl build
Browse files Browse the repository at this point in the history 
Fix the following build failure on musl (which does not provide
PTHREAD_MUTEX_RECURSIVE_NP):

In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289,
                 from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19,
                 from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18,
                 from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28:
/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()':
/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'?
   97 |   VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0);
      |                                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e

Signed-off-by: Fabrice Fontaine <[email protected]>
  • Loading branch information
@ffontaine
ffontaine committed Aug 7, 2021
1 parent 0e124cb commit dd37b97
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Extras/VHACD/inc/vhacdMutex.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
#include <pthread.h>
#endif

#if defined(__APPLE__)
#if defined(__APPLE__) || !defined(__GLIBC__)
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
#endif

Expand Down

0 comments on commit dd37b97

Please sign in to comment.