From 4fde74ccc789dad8be43585ab687046892ee45e0 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 28 Aug 2012 19:43:42 +0000 Subject: [PATCH] Ooops... forgot to add lib_perror.c to the Make.defs file git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5062 42af7a65-404d-4744-a932-0658087f49c3 --- Documentation/NuttxPortingGuide.html | 2 +- configs/README.txt | 4 ++-- lib/stdio/Make.defs | 3 ++- lib/stdio/lib_perror.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index a0f23e1e863..bfde229edc9 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -4363,7 +4363,7 @@ build CONFIG_LIBC_STRERROR_SHORT: If this option is selected, then strerror() 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 defined. + For example, the errno value of 2 will produce the string "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: diff --git a/configs/README.txt b/configs/README.txt index 1a5e3c9d7b3..065759ce678 100644 --- a/configs/README.txt +++ b/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/lib/stdio/Make.defs b/lib/stdio/Make.defs index 1165d53547f..f88a5edd9ee 100644 --- a/lib/stdio/Make.defs +++ b/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/lib/stdio/lib_perror.c b/lib/stdio/lib_perror.c index e065e14b857..3be2dd9db9e 100644 --- a/lib/stdio/lib_perror.c +++ b/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