Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes builds with skipAthena and onlyAthena, and mac builds (#613)

Browse Source 
Did these in cscore and the other repos, but forgot about some of the
oddities jenkins has.
This commit is contained in:
Thad House
2017-08-19 22:15:52 -07:00
committed by Peter Johnson
parent 2a9c454baa
commit 9c804c1351
8 changed files with 171 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/src/main/native/include/HAL/cpp/priority_mutex.h
View File

@@ -10,7 +10,7 @@
// Allows usage with std::lock_guard without including <mutex> separately
#include <mutex>
#if defined(_WIN32)
#if !defined(__linux__)
namespace hal {
// We do not want to use pthreads if in the simulator; however, in the
// simulator, we do not care about priority inversion.