From 59ca22ee6d2b8ba82037f8fdea92365af20d8da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Tue, 3 Jan 2017 09:41:57 +0100
Subject: [PATCH] px4.h: remove this include, causes compile problems on GCC
 6.1.0

It causes problems because it includes px4_nodehandle.h which in turn
includes <functional>, and this is not available on NuttX
---
 src/drivers/camera_trigger/interfaces/src/pwm.cpp | 1 -
 src/modules/logger/log_writer_file.h              | 2 +-
 src/modules/logger/logger.h                       | 2 +-
 src/platforms/nuttx/px4_nuttx_impl.cpp            | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/drivers/camera_trigger/interfaces/src/pwm.cpp b/src/drivers/camera_trigger/interfaces/src/pwm.cpp
index 15942946c7..e6fe4f15a6 100644
--- a/src/drivers/camera_trigger/interfaces/src/pwm.cpp
+++ b/src/drivers/camera_trigger/interfaces/src/pwm.cpp
@@ -1,4 +1,3 @@
-#include <px4.h>
 #include <sys/ioctl.h>
 #include <lib/mathlib/mathlib.h>
 
diff --git a/src/modules/logger/log_writer_file.h b/src/modules/logger/log_writer_file.h
index 1f9ffb0d24..e3c158abd8 100644
--- a/src/modules/logger/log_writer_file.h
+++ b/src/modules/logger/log_writer_file.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <px4.h>
+#include <px4_defines.h>
 #include <stdint.h>
 #include <pthread.h>
 #include <drivers/drv_hrt.h>
diff --git a/src/modules/logger/logger.h b/src/modules/logger/logger.h
index b3fd7378df..459b27c47f 100644
--- a/src/modules/logger/logger.h
+++ b/src/modules/logger/logger.h
@@ -35,7 +35,7 @@
 
 #include "log_writer.h"
 #include "array.h"
-#include <px4.h>
+#include <px4_defines.h>
 #include <drivers/drv_hrt.h>
 #include <uORB/Subscription.hpp>
 #include <version/version.h>
diff --git a/src/platforms/nuttx/px4_nuttx_impl.cpp b/src/platforms/nuttx/px4_nuttx_impl.cpp
index 70e2923208..b51303274d 100644
--- a/src/platforms/nuttx/px4_nuttx_impl.cpp
+++ b/src/platforms/nuttx/px4_nuttx_impl.cpp
@@ -37,7 +37,8 @@
  * PX4 Middleware Wrapper NuttX Implementation
  */
 
-#include <px4.h>
+#include <px4_defines.h>
+#include <px4_middleware.h>
 #include <drivers/drv_hrt.h>