diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-08-28 19:43:42 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-08-28 19:43:42 +0000 |
commit | 8e68b6f0af62f5c5ce393f5b098e2489165c40e2 (patch) | |
tree | 66c30132869c807f3c523317e1d156d3140b25be /nuttx | |
parent | f53d3ecc71d0475d8b2c322310a76e6f5ca735ea (diff) | |
download | px4-firmware-8e68b6f0af62f5c5ce393f5b098e2489165c40e2.tar.gz px4-firmware-8e68b6f0af62f5c5ce393f5b098e2489165c40e2.tar.bz2 px4-firmware-8e68b6f0af62f5c5ce393f5b098e2489165c40e2.zip |
Ooops... forgot to add lib_perror.c to the Make.defs file
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5062 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/Documentation/NuttxPortingGuide.html | 2 | ||||
-rw-r--r-- | nuttx/configs/README.txt | 4 | ||||
-rw-r--r-- | nuttx/lib/stdio/Make.defs | 3 | ||||
-rw-r--r-- | nuttx/lib/stdio/lib_perror.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index a0f23e1e8..bfde229ed 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -4363,7 +4363,7 @@ build <code>CONFIG_LIBC_STRERROR_SHORT</code>: If this option is selected, then <code>strerror()</code> will use a shortened string when it decodes the error. Specifically, <code>strerror()</code> is simply use the string that is the common name for the error. - For example, the <code>errno</code> value of 2 will produce the string "No such file or directory" is <code>CONFIG_LIBC_STRERROR_SHORT</code> is not defined but the string "ENOENT" is <code>CONFIG_LIBC_STRERROR_SHORT</code> is defined. + For example, the <code>errno</code> value of 2 will produce the string "No such file or directory" if <code>CONFIG_LIBC_STRERROR_SHORT</code> is not defined but the string "ENOENT" if <code>CONFIG_LIBC_STRERROR_SHORT</code> is defined. </li> <li> <code>CONFIG_LIBC_PERROR_STDOUT</code>: diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 1a5e3c9d7..065759ce6 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -562,8 +562,8 @@ defconfig -- This is a configuration file similar to the Linux will use a shortened string when it decodes the error. Specifically, strerror() is simply use the string that is the common name for the error. For example, the 'errno' value of 2 will produce the string - "No such file or directory" is CONFIG_LIBC_STRERROR_SHORT is not - defined but the string "ENOENT" is CONFIG_LIBC_STRERROR_SHORT is + "No such file or directory" if CONFIG_LIBC_STRERROR_SHORT is not + defined but the string "ENOENT" if CONFIG_LIBC_STRERROR_SHORT is defined. CONFIG_LIBC_PERROR_STDOUT - POSIX requires that perror() provide its output on stderr. This option may be defined, however, to provide perror() output diff --git a/nuttx/lib/stdio/Make.defs b/nuttx/lib/stdio/Make.defs index 1165d5354..f88a5edd9 100644 --- a/nuttx/lib/stdio/Make.defs +++ b/nuttx/lib/stdio/Make.defs @@ -50,7 +50,8 @@ CSRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \ lib_gets.c lib_fwrite.c lib_libfwrite.c lib_fflush.c \ lib_libflushall.c lib_libfflush.c lib_rdflush.c lib_wrflush.c \ lib_fputc.c lib_puts.c lib_fputs.c lib_ungetc.c lib_vprintf.c \ - lib_fprintf.c lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c + lib_fprintf.c lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c \ + lib_perror.c endif endif diff --git a/nuttx/lib/stdio/lib_perror.c b/nuttx/lib/stdio/lib_perror.c index e065e14b8..3be2dd9db 100644 --- a/nuttx/lib/stdio/lib_perror.c +++ b/nuttx/lib/stdio/lib_perror.c @@ -83,7 +83,7 @@ * Private Data ****************************************************************************/ -#ifndef CONFIG_LIBC_PERROR_DEVNAME +#ifdef CONFIG_LIBC_PERROR_DEVNAME static FILE *perror_stream; #endif |