Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-25 08:36:08 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

solve conflict for definiton of FILE

Browse Source
This commit is contained in:
Thomas Gubler
2014-12-06 15:36:58 +01:00
parent 6f9cbd9751
commit 52c35a8e20
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NuttX
+1 -1
Submodule NuttX updated: ae4b05e2c5...dbe128ceaf
makefiles/toolchain_gnu-arm-eabi.mk
+1 -1
View File
@@ -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
#
src/examples/subscriber/subscriber.cpp
+1
View File
@@ -27,6 +27,7 @@
#include <px4.h>
#include "subscriber_params.h"
#include <cstdio>
using namespace px4;