diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-06 15:36:58 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-06 15:36:58 +0100 |
| commit | 52c35a8e20c99de4e7b6e27856d340a3a355250c (patch) | |
| tree | 8c2fa948dc0ea81f00a0396a5d7dc340e1ff957f | |
| parent | 6f9cbd97510dce4d0bfe715fa77af3b99d282659 (diff) | |
| download | px4-firmware-52c35a8e20c99de4e7b6e27856d340a3a355250c.tar.gz px4-firmware-52c35a8e20c99de4e7b6e27856d340a3a355250c.tar.bz2 px4-firmware-52c35a8e20c99de4e7b6e27856d340a3a355250c.zip | |
solve conflict for definiton of FILE
| 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; |