Merge branch 'dev_ros' into dev_ros_rossharedlib

This commit is contained in:
Thomas Gubler
2014-12-06 15:37:27 +01:00
3 changed files with 3 additions and 2 deletions
+1 -1
Submodule NuttX updated: ae4b05e2c5...dbe128ceaf
+1 -1
View File
@@ -121,7 +121,7 @@ INSTRUMENTATIONDEFINES = $(ARCHINSTRUMENTATIONDEFINES_$(CONFIG_ARCH))
# Language-specific flags # Language-specific flags
# #
ARCHCFLAGS = -std=gnu99 ARCHCFLAGS = -std=gnu99
ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x -fno-threadsafe-statics ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x -fno-threadsafe-statics -D__CUSTOM_FILE_IO__
# Generic warnings # Generic warnings
# #
+1
View File
@@ -27,6 +27,7 @@
#include <px4.h> #include <px4.h>
#include "subscriber_params.h" #include "subscriber_params.h"
#include <cstdio>
using namespace px4; using namespace px4;