diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-03 23:58:25 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-03 23:58:25 +0000 |
| commit | 0eda7244af71108683fb409517ccb18dd78dd65c (patch) | |
| tree | 23311478a2eecd426d6b0d0d2e2e866565cc607b /apps | |
| parent | 0da537768a85ab863bd1a46425db167d6333e51c (diff) | |
| download | nuttx-0eda7244af71108683fb409517ccb18dd78dd65c.tar.gz nuttx-0eda7244af71108683fb409517ccb18dd78dd65c.tar.bz2 nuttx-0eda7244af71108683fb409517ccb18dd78dd65c.zip | |
SAM3U SPI driver update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4017 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/examples/README.txt | 4 | ||||
| -rw-r--r-- | apps/examples/helloxx/main.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/examples/README.txt b/apps/examples/README.txt index 0e7ad7b5c..fee9e66a5 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -146,9 +146,9 @@ examples/helloxx CONFIG_EXAMPLES_HELLOXX_BUILTIN -- Build the helloxx example as a "built-in" that can be executed from the NSH command line. - CONFIG_EXAMPLE_HELLOXX_NOSTATICCONST - Set if system does not support + CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST - Set if system does not support static constructors. - CONFIG_EXAMPLE_HELLOXX_NOSTACKCONST - Set if the system does not + CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST - Set if the system does not support construction of objects on the stack. Also needed: diff --git a/apps/examples/helloxx/main.cxx b/apps/examples/helloxx/main.cxx index f6ec138e8..66f9c827b 100644 --- a/apps/examples/helloxx/main.cxx +++ b/apps/examples/helloxx/main.cxx @@ -78,7 +78,7 @@ class CHelloWorld // Private Data //*************************************************************************** -#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTATICCONST +#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST static CHelloWorld g_HelloWorld; #endif @@ -94,7 +94,7 @@ static CHelloWorld g_HelloWorld; * Name: user_start/nxhello_main ****************************************************************************/ -#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN +#ifdef CONFIG_EXAMPLES_HELLOXX_BUILTIN extern "C" int helloxx_main(int argc, char *argv[]); # define MAIN_NAME helloxx_main # define MAIN_STRING "helloxx_main: " @@ -105,7 +105,7 @@ extern "C" int helloxx_main(int argc, char *argv[]); int MAIN_NAME(int argc, char *argv[]) { -#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTACKCONST +#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST CHelloWorld HelloWorld; #endif CHelloWorld *pHelloWorld = new CHelloWorld; @@ -113,12 +113,12 @@ int MAIN_NAME(int argc, char *argv[]) printf(MAIN_STRING "Saying hello from the dynamically constructed instance\n"); pHelloWorld->HelloWorld(); -#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTACKCONST - printf(MAIN_STRING "Saying hello from the statically constructed instance\n"); +#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTACKCONST + printf(MAIN_STRING "Saying hello from the instance constructed of the stack\n"); HelloWorld.HelloWorld(); #endif -#ifndef CONFIG_EXAMPLE_HELLOXX_NOSTATICCONST +#ifndef CONFIG_EXAMPLES_HELLOXX_NOSTATICCONST printf(MAIN_STRING "Saying hello from the statically constructed instance\n"); g_HelloWorld.HelloWorld(); #endif |