diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-06 11:25:24 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-06 11:25:24 +0100 |
commit | 359989a2eb22bb54857cb40fe539af3f4dfa672d (patch) | |
tree | 0d23bc932c75313c30340fadd8ffc1d8b2bcb2d9 /apps/mavlink | |
parent | d3fd3d8219179251d10655944992da75abb8932b (diff) | |
parent | 58309fd6a863805e16602f4bec82eb35e0a14262 (diff) | |
download | px4-firmware-359989a2eb22bb54857cb40fe539af3f4dfa672d.tar.gz px4-firmware-359989a2eb22bb54857cb40fe539af3f4dfa672d.tar.bz2 px4-firmware-359989a2eb22bb54857cb40fe539af3f4dfa672d.zip |
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_io_mixing_adc
Diffstat (limited to 'apps/mavlink')
-rw-r--r-- | apps/mavlink/mavlink_log.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/mavlink/mavlink_log.c b/apps/mavlink/mavlink_log.c index 660e282f8..73d59e76f 100644 --- a/apps/mavlink/mavlink_log.c +++ b/apps/mavlink/mavlink_log.c @@ -40,6 +40,7 @@ */ #include <string.h> +#include <stdlib.h> #include "mavlink_log.h" @@ -51,7 +52,7 @@ void mavlink_logbuffer_init(struct mavlink_logbuffer *lb, int size) { } int mavlink_logbuffer_is_full(struct mavlink_logbuffer *lb) { - return lb->count == lb->size; + return lb->count == (int)lb->size; } int mavlink_logbuffer_is_empty(struct mavlink_logbuffer *lb) { @@ -77,4 +78,4 @@ int mavlink_logbuffer_read(struct mavlink_logbuffer *lb, struct mavlink_logmessa } else { return 1; } -}
\ No newline at end of file +} |