fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuttX

@ -1 +1 @@
Subproject commit ae4b05e2c51d07369b5d131052099ac346b0841c
Subproject commit dbe128ceaf0e486b2ef799f14c13d38586e6cca8

2
makefiles/toolchain_gnu-arm-eabi.mk
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
#

1
src/examples/subscriber/subscriber.cpp
View File

@ -27,6 +27,7 @@
#include <px4.h>
#include "subscriber_params.h"
#include <cstdio>
using namespace px4;