aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-03-11 16:20:37 +0400
committerAnton Babushkin <anton.babushkin@me.com>2014-03-11 16:20:37 +0400
commit35b8d00e17cc8161e9d2687af3f9313d010c11ea (patch)
tree0aca62e992da2e0cf72561ba5f00ec13d68c6b79 /src
parent0ad38a73231877ec142946cb4c380c74a1633e63 (diff)
downloadpx4-firmware-35b8d00e17cc8161e9d2687af3f9313d010c11ea.tar.gz
px4-firmware-35b8d00e17cc8161e9d2687af3f9313d010c11ea.tar.bz2
px4-firmware-35b8d00e17cc8161e9d2687af3f9313d010c11ea.zip
mavlink: task_main noreturn attribute removed
Diffstat (limited to 'src')
-rw-r--r--src/modules/mavlink/mavlink_main.cpp3
-rw-r--r--src/modules/mavlink/mavlink_main.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 2dfc67fd4..4c79c67b4 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -221,9 +221,6 @@ Mavlink::Mavlink() :
Mavlink::~Mavlink()
{
- warnx("DESTRUCTOR");
- usleep(1000000);
-
if (_task_running) {
/* task wakes up every 10ms or so at the longest */
_task_should_exit = true;
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h
index ffc69bc81..ccff6614f 100644
--- a/src/modules/mavlink/mavlink_main.h
+++ b/src/modules/mavlink/mavlink_main.h
@@ -309,6 +309,6 @@ private:
/**
* Main mavlink task.
*/
- int task_main(int argc, char *argv[]) __attribute__((noreturn));
+ int task_main(int argc, char *argv[]);
};