diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
commit | 25af4b266ca48b183a1ad375856396f67d6ab30f (patch) | |
tree | 64e031ec3747ab706e5ae8ed9fd052e12ee3248b /nuttx-configs/px4fmu-v2 | |
parent | ad189cf7d69b8de16244b90d398e1d84ed6d0f4b (diff) | |
parent | 9b535f6553944f3468bbec9203301623412524ad (diff) | |
download | px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.gz px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.bz2 px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.zip |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitignore
src/lib/uavcan
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
-rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/Make.defs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs index 5ae27aa00..b3cf28b7a 100644 --- a/nuttx-configs/px4fmu-v2/nsh/Make.defs +++ b/nuttx-configs/px4fmu-v2/nsh/Make.defs @@ -139,8 +139,7 @@ ARCHCWARNINGS = $(ARCHWARNINGS) \ -Wold-style-declaration \ -Wmissing-parameter-type \ -Wmissing-prototypes \ - -Wnested-externs \ - -Wunsuffixed-float-constants + -Wnested-externs ARCHWARNINGSXX = $(ARCHWARNINGS) \ -Wno-psabi ARCHDEFINES = |