diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-26 08:20:13 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-26 08:20:13 -0600 |
commit | 95924641076c49d8f4aacc84ad4e35c48610a58a (patch) | |
tree | 4f58d42b3704d08a1ca8b41baaa5a23dd9f9a89c /apps | |
parent | 9040b330023403db3f2f613b3bbede7906954d72 (diff) | |
download | px4-nuttx-95924641076c49d8f4aacc84ad4e35c48610a58a.tar.gz px4-nuttx-95924641076c49d8f4aacc84ad4e35c48610a58a.tar.bz2 px4-nuttx-95924641076c49d8f4aacc84ad4e35c48610a58a.zip |
Fix some misplaced conditional compilation. From David Sidrane
Diffstat (limited to 'apps')
-rw-r--r-- | apps/system/cdcacm/cdcacm_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/system/cdcacm/cdcacm_main.c b/apps/system/cdcacm/cdcacm_main.c index a9f8b504c..c53d2df69 100644 --- a/apps/system/cdcacm/cdcacm_main.c +++ b/apps/system/cdcacm/cdcacm_main.c @@ -122,15 +122,14 @@ int sercon_main(int argc, char *argv[]) * * Description: * This is a program entry point that will disconnect the CDC/ACM serial -#ifdef CONFIG_BUILD_KERNEL * device. -int main(int argc, FAR char **argv) - * -#else ****************************************************************************/ -#endif +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char **argv) +#else int serdis_main(int argc, char *argv[]) +#endif { /* First check if the USB mass storage device is already connected */ |