Revision: 70299
http://sourceforge.net/p/brlcad/code/70299
Author: starseeker
Date: 2017-09-18 19:53:46 +0000 (Mon, 18 Sep 2017)
Log Message:
-----------
CMake threads test isn't setting these right on FreeBSD
Modified Paths:
--------------
brlcad/trunk/src/other/gdal/port/cpl_multiproc.cpp
brlcad/trunk/src/other/proj-4/src/pj_mutex.c
Modified: brlcad/trunk/src/other/gdal/port/cpl_multiproc.cpp
===================================================================
--- brlcad/trunk/src/other/gdal/port/cpl_multiproc.cpp 2017-09-18 14:06:44 UTC
(rev 70298)
+++ brlcad/trunk/src/other/gdal/port/cpl_multiproc.cpp 2017-09-18 19:53:46 UTC
(rev 70299)
@@ -1445,7 +1445,7 @@
return;
}
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(HAVE_PTHREAD_MUTEX_RECURSIVE)
|| defined(__FreeBSD__)
{
pthread_mutexattr_t attr;
pthread_mutexattr_init( &attr );
Modified: brlcad/trunk/src/other/proj-4/src/pj_mutex.c
===================================================================
--- brlcad/trunk/src/other/proj-4/src/pj_mutex.c 2017-09-18 14:06:44 UTC
(rev 70298)
+++ brlcad/trunk/src/other/proj-4/src/pj_mutex.c 2017-09-18 19:53:46 UTC
(rev 70299)
@@ -124,7 +124,7 @@
pthread_mutex_lock( &pj_precreated_lock);
pthread_mutexattr_init(&mutex_attr);
-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
#else
pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
