fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 02:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

i2c_spi_buses:Track NuttX change to getopts avoid name collision

Browse Source 
NuttX #defined optarg and getopt to move to TLS. This fixes the
  name collision.
This commit is contained in:
David Sidrane
2021-06-16 17:07:47 +02:00
committed by Julian Oes
parent 64db89ab20
commit 84dd8839a2
55 changed files with 245 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/barometer/ms5611/ms5611_main.cpp
+4 -4
View File
@@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012-2019 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2019, 2021 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -100,10 +100,10 @@ extern "C" int ms5611_main(int argc, char *argv[])
cli.default_spi_frequency = 20 * 1000 * 1000;
uint16_t dev_type_driver = DRV_BARO_DEVTYPE_MS5611;
while ((ch = cli.getopt(argc, argv, "T:")) != EOF) {
while ((ch = cli.getOpt(argc, argv, "T:")) != EOF) {
switch (ch) {
case 'T': {
int val = atoi(cli.optarg());
int val = atoi(cli.optArg());
if (val == 5611) {
cli.type = MS5611_DEVICE;
@@ -118,7 +118,7 @@ extern "C" int ms5611_main(int argc, char *argv[])
}
}
const char *verb = cli.optarg();
const char *verb = cli.optArg();
if (!verb) {
ThisDriver::print_usage();