From 152c6db212100da22676707a34460cf6c4e35440 Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Tue, 24 Jul 2018 23:39:45 +0200
Subject: [PATCH] Fix logger signed unsigned error with GCC 7.3 in Cygwin
 (#10009)

---
 src/modules/logger/logger.cpp | 4 +++-
 src/platforms/px4_defines.h   | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/modules/logger/logger.cpp b/src/modules/logger/logger.cpp
index 37f4b1ce70..be8d22b89f 100644
--- a/src/modules/logger/logger.cpp
+++ b/src/modules/logger/logger.cpp
@@ -64,13 +64,15 @@
 #include <replay/definitions.hpp>
 #include <version/version.h>
 
-#ifdef __PX4_DARWIN
+#if defined(__PX4_DARWIN)
 #include <sys/param.h>
 #include <sys/mount.h>
 #else
 #include <sys/statfs.h>
 #endif
 
+typedef decltype(statfs::f_bavail) px4_statfs_buf_f_bavail_t;
+
 #define GPS_EPOCH_SECS ((time_t)1234567890ULL)
 
 //#define DBGPRINT //write status output every few seconds
diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h
index fd5249f092..7e2063d4da 100644
--- a/src/platforms/px4_defines.h
+++ b/src/platforms/px4_defines.h
@@ -112,7 +112,6 @@ typedef param_t px4_param_t;
 
 #define PX4_ROOTFSDIR ""
 #define _PX4_IOC(x,y) _IOC(x,y)
-#define px4_statfs_buf_f_bavail_t int
 
 // mode for open with O_CREAT
 #define PX4_O_MODE_777 0777
@@ -170,8 +169,6 @@ using ::isfinite;
 #define USEC_PER_TICK (1000000/PX4_TICKS_PER_SEC)
 #define USEC2TICK(x) (((x)+(USEC_PER_TICK/2))/USEC_PER_TICK)
 
-#define px4_statfs_buf_f_bavail_t unsigned long
-
 #ifdef __PX4_QURT
 
 // QURT specific