diff options
author | M.H.Kabir <mhkabir98@gmail.com> | 2014-12-30 16:23:52 +0530 |
---|---|---|
committer | M.H.Kabir <mhkabir98@gmail.com> | 2014-12-30 16:23:52 +0530 |
commit | ce03794eca953a109100386af337491176481faf (patch) | |
tree | dad08b048240b20c0029803a44c858f41b340ec4 /src/modules/mavlink | |
parent | 33653b25c6569013d0a1a5a4885457c0bdc23e06 (diff) | |
parent | 4942883ddcb5d1a09e96335b1edbbf2d937937b4 (diff) | |
download | px4-firmware-ce03794eca953a109100386af337491176481faf.tar.gz px4-firmware-ce03794eca953a109100386af337491176481faf.tar.bz2 px4-firmware-ce03794eca953a109100386af337491176481faf.zip |
Merge remote-tracking branch 'upstream/master' into flow_orient
Conflicts:
src/drivers/px4flow/px4flow.cpp
Diffstat (limited to 'src/modules/mavlink')
-rw-r--r-- | src/modules/mavlink/module.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/mavlink/module.mk b/src/modules/mavlink/module.mk index 91fdd6154..f9d30dcbe 100644 --- a/src/modules/mavlink/module.mk +++ b/src/modules/mavlink/module.mk @@ -53,4 +53,6 @@ MAXOPTIMIZATION = -Os MODULE_STACKSIZE = 1024 -EXTRACXXFLAGS = -Weffc++ +EXTRACXXFLAGS = -Weffc++ -Wno-attributes -Wno-packed + +EXTRACFLAGS = -Wno-packed |