Resolve conflict
This commit is contained in:
commit
a2b2985766
@ -8892,4 +8892,5 @@
|
||||
* include/wchar.h: Add a mostly bogus wchar.h header file. This file
|
||||
is mostly bogus because noneo of the wide character operations are
|
||||
currently supported in the Nuttx C library (2014-10-27).
|
||||
|
||||
* include/termios.h, libc/termios/lib_isatty.c, and Make.defs: Add
|
||||
isatty() function. From Alan Carvalho de Assis (2014-10-27).
|
||||
|
@ -298,7 +298,7 @@ int tcsendbreak(int fd, int duration);
|
||||
|
||||
int tcsetattr(int fd, int options, FAR const struct termios *termiosp);
|
||||
|
||||
/* Verify if a file descript is a terminal i/o file */
|
||||
/* Check if a file descriptor corresponds to a terminal I/O file */
|
||||
|
||||
int isatty(int fd);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user