From be8adbfdf35ed96cc5d40c1ea8526adb4a645853 Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Mon, 11 Dec 2017 16:27:26 +0000
Subject: [PATCH] Cygwin: refactored & simplified some of the OS define logic

---
 platforms/posix/cmake/px4_impl_os.cmake | 17 ++++++++---------
 src/lib/rc/dsm.cpp                      |  6 +++---
 src/platforms/px4_time.h                | 11 ++++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/platforms/posix/cmake/px4_impl_os.cmake b/platforms/posix/cmake/px4_impl_os.cmake
index 39ae7e875c..d4d8479f6f 100644
--- a/platforms/posix/cmake/px4_impl_os.cmake
+++ b/platforms/posix/cmake/px4_impl_os.cmake
@@ -171,12 +171,15 @@ function(px4_os_add_flags)
 		)
 
 	# This block sets added_definitions and added_cxx_flags.
+	set(added_definitions
+		-D__PX4_POSIX
+		-Dnoreturn_function=__attribute__\(\(noreturn\)\)
+		)
+
 	if(UNIX AND APPLE)
-		set(added_definitions
-			-D__PX4_POSIX
+		list(APPEND added_definitions
 			-D__PX4_DARWIN
 			-D__DF_DARWIN
-			-Dnoreturn_function=__attribute__\(\(noreturn\)\)
 			)
 
 		set(added_cxx_flags)
@@ -197,21 +200,17 @@ function(px4_os_add_flags)
 		endif()
 
 	elseif(CYGWIN)
-		set(added_definitions
-			-D__PX4_POSIX
+		list(APPEND added_definitions
 			-D__PX4_CYGWIN
 			-D_GNU_SOURCE
 			-D__USE_LINUX_IOCTL_DEFS
-			-Dnoreturn_function=__attribute__\(\(noreturn\)\)
 			-U __CUSTOM_FILE_IO__
 			)
 
 	else()
-		set(added_definitions
-			-D__PX4_POSIX
+		list(APPEND added_definitions
 			-D__PX4_LINUX
 			-D__DF_LINUX
-			-Dnoreturn_function=__attribute__\(\(noreturn\)\)
 			)
 
 		# Use -pthread For linux/g++.
diff --git a/src/lib/rc/dsm.cpp b/src/lib/rc/dsm.cpp
index b94e77b514..78959a0127 100644
--- a/src/lib/rc/dsm.cpp
+++ b/src/lib/rc/dsm.cpp
@@ -52,11 +52,11 @@
 #include "common_rc.h"
 #include <drivers/drv_hrt.h>
 
-#if defined (__PX4_LINUX) || defined (__PX4_DARWIN) || defined(__PX4_CYGWIN) || defined(__PX4_QURT)
-#define dsm_udelay(arg) usleep(arg)
-#else
+#if defined(__PX4_NUTTX)
 #include <nuttx/arch.h>
 #define dsm_udelay(arg)    up_udelay(arg)
+#else
+#define dsm_udelay(arg) usleep(arg)
 #endif
 
 // #define DSM_DEBUG
diff --git a/src/platforms/px4_time.h b/src/platforms/px4_time.h
index b123361c25..9324151cd0 100644
--- a/src/platforms/px4_time.h
+++ b/src/platforms/px4_time.h
@@ -16,11 +16,6 @@ __EXPORT unsigned int sleep(unsigned int sec);
 
 __END_DECLS
 
-#elif defined(__PX4_LINUX) || defined(__PX4_NUTTX) || defined(__PX4_DARWIN) || defined(__PX4_CYGWIN)
-
-#define px4_clock_gettime clock_gettime
-#define px4_clock_settime clock_settime
-
 #elif defined(__PX4_QURT)
 
 #include <sys/timespec.h>
@@ -33,4 +28,10 @@ int px4_clock_settime(clockid_t clk_id, struct timespec *tp);
 __EXPORT unsigned int sleep(unsigned int sec);
 
 __END_DECLS
+
+#else
+
+#define px4_clock_gettime clock_gettime
+#define px4_clock_settime clock_settime
+
 #endif