From 354524c8c2c87ca2a85c3d3d5e64426ba8e3f847 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 28 Dec 2014 17:09:35 -0600 Subject: [PATCH] apps/system/usbmsc: Fix some corrupted conditional compilation that crept in. Looks like some automatated update gone awry. --- system/usbmsc/usbmsc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c index 76fa81138..298a6e3ce 100644 --- a/system/usbmsc/usbmsc_main.c +++ b/system/usbmsc/usbmsc_main.c @@ -587,15 +587,15 @@ int msconn_main(int argc, char *argv[]) * device. This program is only available if CONFIG_NSH_BUILTIN_APPS * is defined in the NuttX configuration. In that case, this program can * be executed by entering the "msdis" command at the NSH console. -#ifdef CONFIG_BUILD_KERNEL * -int main(int argc, FAR char **argv) ****************************************************************************/ -#else #ifdef CONFIG_NSH_BUILTIN_APPS -#endif +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char **argv) +#else int msdis_main(int argc, char *argv[]) +#endif { /* First check if the USB mass storage device is already connected */