mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-19 04:33:34 +08:00
Can't use 'class' as a field name! Backward conditional compilation in usbmsc.c
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4350 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
@@ -139,7 +139,7 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
|
||||
/* Initialization/Uninitialization ******************************************/
|
||||
|
||||
static void usbmsc_lununinitialize(struct usbmsc_lun_s *lun);
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
static int usbmsc_exportluns(FAR void *handle);
|
||||
#endif
|
||||
|
||||
@@ -1578,7 +1578,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_USBMSC_COMPOSITE
|
||||
#ifdef CONFIG_USBMSC_COMPOSITE
|
||||
static
|
||||
#endif
|
||||
int usbmsc_exportluns(FAR void *handle)
|
||||
@@ -1708,7 +1708,6 @@ void usbmsc_uninitialize(FAR void *handle)
|
||||
pthread_attr_t attr;
|
||||
#endif
|
||||
void *value;
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
#ifdef CONFIG_DEBUG
|
||||
@@ -1743,7 +1742,7 @@ void usbmsc_uninitialize(FAR void *handle)
|
||||
* garbage
|
||||
*/
|
||||
|
||||
ret = pthread_join(priv->thread, &value);
|
||||
(void)pthread_join(priv->thread, &value);
|
||||
}
|
||||
priv->thread = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user