11 files changed, 18 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95a6f12fe..eca28b15e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(px4)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+add_definitions(-D__PX4_ROS)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
diff --git a/src/examples/publisher/publisher_main.cpp b/src/examples/publisher/publisher_main.cpp
index 5cac42250..81439a8be 100644
--- a/src/examples/publisher/publisher_main.cpp
+++ b/src/examples/publisher/publisher_main.cpp
@@ -51,7 +51,7 @@ using namespace px4;
 
 PX4_MAIN_FUNCTION(publisher);
 
-#if !defined(__linux) && !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__PX4_ROS)
 extern "C" __EXPORT int publisher_main(int argc, char *argv[]);
 int publisher_main(int argc, char *argv[])
 {
diff --git a/src/examples/subscriber/subscriber_main.cpp b/src/examples/subscriber/subscriber_main.cpp
index c824e34e3..906921e01 100644
--- a/src/examples/subscriber/subscriber_main.cpp
+++ b/src/examples/subscriber/subscriber_main.cpp
@@ -51,7 +51,7 @@ using namespace px4;
 
 PX4_MAIN_FUNCTION(subscriber);
 
-#if !defined(__linux) && !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__PX4_ROS)
 extern "C" __EXPORT int subscriber_main(int argc, char *argv[]);
 int subscriber_main(int argc, char *argv[])
 {
diff --git a/src/lib/mathlib/math/Matrix.hpp b/src/lib/mathlib/math/Matrix.hpp
index 43ba6b9d9..68f0a777d 100644
--- a/src/lib/mathlib/math/Matrix.hpp
+++ b/src/lib/mathlib/math/Matrix.hpp
@@ -122,7 +122,7 @@ public:
 		memcpy(data, d, sizeof(data));
 	}
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 	/**
 	 * set data from boost::array
 	 */
diff --git a/src/modules/mc_att_control_multiplatform/mc_att_control_main.cpp b/src/modules/mc_att_control_multiplatform/mc_att_control_main.cpp
index 69f63a5b1..e2f2f2530 100644
--- a/src/modules/mc_att_control_multiplatform/mc_att_control_main.cpp
+++ b/src/modules/mc_att_control_multiplatform/mc_att_control_main.cpp
@@ -67,7 +67,7 @@ using namespace px4;
 
 PX4_MAIN_FUNCTION(mc_att_control_multiplatform);
 
-#if !defined(__linux) && !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__PX4_ROS)
 /**
  * Multicopter attitude control app start / stop handling function
  *
diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h
index ef43c55b8..457b5abe3 100644
--- a/src/platforms/px4_defines.h
+++ b/src/platforms/px4_defines.h
@@ -46,7 +46,7 @@
 #define PX4_PARAM_DEFINE_FLOAT(_name) PARAM_DEFINE_FLOAT(_name, PX4_PARAM_DEFAULT_VALUE_NAME(_name))
 
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 /*
  * Building for running within the ROS environment
  */
diff --git a/src/platforms/px4_includes.h b/src/platforms/px4_includes.h
index 4d29bc3cd..fc31162c8 100644
--- a/src/platforms/px4_includes.h
+++ b/src/platforms/px4_includes.h
@@ -41,7 +41,7 @@
 
 #include <stdbool.h>
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 /*
  * Building for running within the ROS environment
  */
diff --git a/src/platforms/px4_middleware.h b/src/platforms/px4_middleware.h
index 54050de8b..cd52fd650 100644
--- a/src/platforms/px4_middleware.h
+++ b/src/platforms/px4_middleware.h
@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 #define __EXPORT
 #endif
 
@@ -53,7 +53,7 @@ __EXPORT void init(int argc, char *argv[], const char *process_name);
 
 __EXPORT uint64_t get_time_micros();
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 /**
  * Returns true if the app/task should continue to run
  */
diff --git a/src/platforms/px4_nodehandle.h b/src/platforms/px4_nodehandle.h
index 3c2bb2d44..624a466fd 100644
--- a/src/platforms/px4_nodehandle.h
+++ b/src/platforms/px4_nodehandle.h
@@ -43,7 +43,7 @@
 #include "px4_publisher.h"
 #include "px4_middleware.h"
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 /* includes when building for ros */
 #include "ros/ros.h"
 #include <list>
@@ -55,7 +55,7 @@
 
 namespace px4
 {
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 class NodeHandle :
 	private ros::NodeHandle
 {
diff --git a/src/platforms/px4_publisher.h b/src/platforms/px4_publisher.h
index 6b6d8e39e..c6f3d6108 100644
--- a/src/platforms/px4_publisher.h
+++ b/src/platforms/px4_publisher.h
@@ -37,7 +37,7 @@
  * PX4 Middleware Wrapper Node Handle
  */
 #pragma once
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 /* includes when building for ros */
 #include "ros/ros.h"
 #else
@@ -60,7 +60,7 @@ public:
 
 };
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 class Publisher :
 	public PublisherBase
 {
diff --git a/src/platforms/px4_subscriber.h b/src/platforms/px4_subscriber.h
index 4b6d5b58f..107c60189 100644
--- a/src/platforms/px4_subscriber.h
+++ b/src/platforms/px4_subscriber.h
@@ -36,9 +36,11 @@
  *
  * PX4 Middleware Wrapper Subscriber
  */
-#include <functional>
 #pragma once
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+
+#include <functional>
+
+#if defined(__PX4_ROS)
 /* includes when building for ros */
 #include "ros/ros.h"
 #else
@@ -87,7 +89,7 @@ public:
 	virtual void * get_void_ptr() = 0;
 };
 
-#if defined(__linux) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__PX4_ROS)
 /**
  * Subscriber class that is templated with the ros n message type
  */