diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-01 14:53:38 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-01 14:53:38 +0000 |
| commit | 04a4ef84f01ca2bed9cda2a58f583f7a9428949d (patch) | |
| tree | 865d4f643ca3024818a963b2d5ff1aceb8c3a9f5 /nuttx | |
| parent | 966e801032745429ec2f28f9e5ab0b3fc8a68d3d (diff) | |
| download | px4-firmware-04a4ef84f01ca2bed9cda2a58f583f7a9428949d.tar.gz px4-firmware-04a4ef84f01ca2bed9cda2a58f583f7a9428949d.tar.bz2 px4-firmware-04a4ef84f01ca2bed9cda2a58f583f7a9428949d.zip | |
NxWidgets updates from Petteri Aimonen; buildroot GDB build fix from Ken Bannister
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5592 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/README.txt | 6 | ||||
| -rw-r--r-- | nuttx/libc/stdio/lib_fgets.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nuttx/README.txt b/nuttx/README.txt index 571f8e04e..da1ed10c6 100644 --- a/nuttx/README.txt +++ b/nuttx/README.txt @@ -533,6 +533,12 @@ NuttX Buildroot Toolchain an ARM Cortex-M3/4, you will need to set CONFIG_ARMV7M_OABI_TOOLCHAIN in the .config file in order to pick the right tool prefix. + If the make system ever picks the wrong prefix for your toolchain, you + can always specify the prefix on the command to override the default + like: + + make CROSSDEV=arm-nuttx-elf + SHELLS ^^^^^^ diff --git a/nuttx/libc/stdio/lib_fgets.c b/nuttx/libc/stdio/lib_fgets.c index 35d024ebb..87eed285d 100644 --- a/nuttx/libc/stdio/lib_fgets.c +++ b/nuttx/libc/stdio/lib_fgets.c @@ -150,7 +150,7 @@ char *fgets(FAR char *buf, int buflen, FILE *stream) if (ch == '\n') #elif defined(CONFIG_EOL_IS_CR) if (ch == '\r') -#else /* elif CONFIG_EOL_IS_EITHER_CRLF */ +#else /* elif defined(CONFIG_EOL_IS_EITHER_CRLF) */ if (ch == '\n' || ch == '\r') #endif { |