diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-06 15:37:27 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-06 15:37:27 +0100 |
| commit | 042be3d49ac09c8a6e334775bb8ed5efb5956b0f (patch) | |
| tree | 178539ed210999190352f37cd82219d2ba50002f | |
| parent | b9de4d0e1469b7256cadc3948ba9251e0c23ac2c (diff) | |
| parent | 52c35a8e20c99de4e7b6e27856d340a3a355250c (diff) | |
| download | px4-firmware-042be3d49ac09c8a6e334775bb8ed5efb5956b0f.tar.gz px4-firmware-042be3d49ac09c8a6e334775bb8ed5efb5956b0f.tar.bz2 px4-firmware-042be3d49ac09c8a6e334775bb8ed5efb5956b0f.zip | |
Merge branch 'dev_ros' into dev_ros_rossharedlib
| m--------- | NuttX | 0 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 2 | ||||
| -rw-r--r-- | src/examples/subscriber/subscriber.cpp | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/NuttX b/NuttX -Subproject ae4b05e2c51d07369b5d131052099ac346b0841 +Subproject dbe128ceaf0e486b2ef799f14c13d38586e6cca diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index 84e5cd08a..b98b1a0af 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -121,7 +121,7 @@ INSTRUMENTATIONDEFINES = $(ARCHINSTRUMENTATIONDEFINES_$(CONFIG_ARCH)) # Language-specific flags # 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 # diff --git a/src/examples/subscriber/subscriber.cpp b/src/examples/subscriber/subscriber.cpp index 68003b6df..0d9ca1fa7 100644 --- a/src/examples/subscriber/subscriber.cpp +++ b/src/examples/subscriber/subscriber.cpp @@ -27,6 +27,7 @@ #include <px4.h> #include "subscriber_params.h" +#include <cstdio> using namespace px4; |