aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SITL: cope with cygwin64

Browse Source
This commit is contained in:
Andrew Tridgell 2018-03-02 15:27:58 +11:00
parent 153ad95398
commit d75e47a4d8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/SITL/SIM_Aircraft.cpp
View File

@ -23,7 +23,7 @@
#include <unistd.h>
#ifdef __CYGWIN__
#if defined(__CYGWIN__) || defined(__CYGWIN64__)
#include <windows.h>
#include <time.h>
#include <mmsystem.h>
@ -54,7 +54,7 @@ Aircraft::Aircraft(const char *home_str, const char *frame_str) :
rate_hz(1200.0f),
autotest_dir(nullptr),
frame(frame_str),
#ifdef __CYGWIN__
#if defined(__CYGWIN__) || defined(__CYGWIN64__)
min_sleep_time(20000)
#else
min_sleep_time(5000)
@ -429,7 +429,7 @@ void Aircraft::fill_fdm(struct sitl_fdm &fdm)
uint64_t Aircraft::get_wall_time_us() const
{
#ifdef __CYGWIN__
#if defined(__CYGWIN__) || defined(__CYGWIN64__)
static DWORD tPrev;
static uint64_t last_ret_us;
if (tPrev == 0) {

2
libraries/SITL/SIM_FlightAxis.cpp
View File

@ -103,7 +103,7 @@ void *FlightAxis::update_thread(void *arg)
{
FlightAxis *flightaxis = (FlightAxis *)arg;
#ifdef __CYGWIN__
#if defined(__CYGWIN__) || defined(__CYGWIN64__)
//Cygwin doesn't support pthread_setname_np
#elif defined(__APPLE__) && defined(__MACH__)
pthread_setname_np("ardupilot-flightaxis");