diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-22 00:51:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-22 00:51:01 +0000 |
| commit | 0c7804b74dcec7d746e95425157bd6afc1435de6 (patch) | |
| tree | f1012156c3adfa9214f97d33ca5c8e0fea1402fd /apps/examples/hello/main.c | |
| parent | 68d6dcf76ee0aa13cd6dd0d6f9b07f2d8fdf64d4 (diff) | |
| download | nuttx-0c7804b74dcec7d746e95425157bd6afc1435de6.tar.gz nuttx-0c7804b74dcec7d746e95425157bd6afc1435de6.tar.bz2 nuttx-0c7804b74dcec7d746e95425157bd6afc1435de6.zip | |
NFS update + make some examples configurable as NSH built-ins
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4501 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/hello/main.c')
| -rw-r--r-- | apps/examples/hello/main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/examples/hello/main.c b/apps/examples/hello/main.c index 308603f33..7934dc34b 100644 --- a/apps/examples/hello/main.c +++ b/apps/examples/hello/main.c @@ -1,8 +1,8 @@ /**************************************************************************** * examples/hello/main.c * - * Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -53,10 +53,16 @@ ****************************************************************************/ /**************************************************************************** - * user_start + * user_start/hello_main ****************************************************************************/ -int user_start(int argc, char *argv[]) +#ifdef CONFIG_EXAMPLES_HELLO_BUILTIN +# define MAIN_NAME hello_main +#else +# define MAIN_NAME user_start +#endif + +int MAIN_NAME(int argc, char *argv[]) { printf("Hello, World!!\n"); return 0; |