diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
| commit | f4e0dc2857da7a8b42b7439ae57310b23c902cd9 (patch) | |
| tree | d31b6697458c5f54672ea6b5bbc3a267e6fa1be5 /src/examples/matlab_csv_serial/matlab_csv_serial.c | |
| parent | acb4844939f971a1a33515316f5e6c7c8f668f12 (diff) | |
| parent | 22f744f0e17f83a706998381d1977c9cb24d457a (diff) | |
| download | px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.gz px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.bz2 px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitmodules
Diffstat (limited to 'src/examples/matlab_csv_serial/matlab_csv_serial.c')
| -rw-r--r-- | src/examples/matlab_csv_serial/matlab_csv_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/examples/matlab_csv_serial/matlab_csv_serial.c b/src/examples/matlab_csv_serial/matlab_csv_serial.c index c66bebeec..a95f45d1a 100644 --- a/src/examples/matlab_csv_serial/matlab_csv_serial.c +++ b/src/examples/matlab_csv_serial/matlab_csv_serial.c @@ -107,7 +107,7 @@ int matlab_csv_serial_main(int argc, char *argv[]) SCHED_PRIORITY_MAX - 5, 2000, matlab_csv_serial_thread_main, - (argv) ? (const char **)&argv[2] : (const char **)NULL); + (argv) ? (char * const *)&argv[2] : (char * const *)NULL); exit(0); } |