solve conflict for definiton of FILE

10 years ago · 52c35a8e20
3 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
				@@ -1 +1 @@
-Subproject commit ae4b05e2c51d07369b5d131052099ac346b0841c
+Subproject commit dbe128ceaf0e486b2ef799f14c13d38586e6cca8
--- a/makefiles/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/toolchain_gnu-arm-eabi.mk
@ -121,7 +121,7 @@ INSTRUMENTATIONDEFINES	 = $(ARCHINSTRUMENTATIONDEFINES_$(CONFIG_ARCH))
				@@ -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
 #
--- a/src/examples/subscriber/subscriber.cpp
+++ b/src/examples/subscriber/subscriber.cpp
@ -27,6 +27,7 @@
				@@ -27,6 +27,7 @@

 #include <px4.h>
 #include "subscriber_params.h"
+#include <cstdio>

 using namespace px4;