diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-31 14:15:36 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-31 14:15:36 +0000 |
| commit | 683c7dbd29a864ee20c792918fd32eedf9b53f69 (patch) | |
| tree | ecf3cd73d71ad66b3c62fe2f86aff56f2d8b06fe /nuttx/drivers/usbdev/usbmsc.c | |
| parent | 7e732a9cb78f197c4b44892a574842ca1eba0823 (diff) | |
| download | px4-nuttx-683c7dbd29a864ee20c792918fd32eedf9b53f69.tar.gz px4-nuttx-683c7dbd29a864ee20c792918fd32eedf9b53f69.tar.bz2 px4-nuttx-683c7dbd29a864ee20c792918fd32eedf9b53f69.zip | |
Can't use 'class' as a field name! Backward conditional compilation in usbmsc.c
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4350 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbdev/usbmsc.c')
| -rw-r--r-- | nuttx/drivers/usbdev/usbmsc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nuttx/drivers/usbdev/usbmsc.c b/nuttx/drivers/usbdev/usbmsc.c index 948b72fe6..51caeb431 100644 --- a/nuttx/drivers/usbdev/usbmsc.c +++ b/nuttx/drivers/usbdev/usbmsc.c @@ -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; |