summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nuttx/Documentation/NuttxPortingGuide.html2
-rw-r--r--nuttx/configs/README.txt4
-rw-r--r--nuttx/lib/stdio/Make.defs3
-rw-r--r--nuttx/lib/stdio/lib_perror.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index a0f23e1e86..bfde229edc 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 &quot;No such file or directory&quot; is <code>CONFIG_LIBC_STRERROR_SHORT</code> is not defined but the string &quot;ENOENT&quot; is <code>CONFIG_LIBC_STRERROR_SHORT</code> is defined.
+ For example, the <code>errno</code> value of 2 will produce the string &quot;No such file or directory&quot; if <code>CONFIG_LIBC_STRERROR_SHORT</code> is not defined but the string &quot;ENOENT&quot; 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 1a5e3c9d7b..065759ce67 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 1165d53547..f88a5edd9e 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 e065e14b85..3be2dd9db9 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