summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-08-08 10:50:49 +0300
committerGordon Ross <gwr@nexenta.com>2017-12-03 15:49:24 -0500
commit9c88ac3ab4edaa5e8c0130ed1b4b376ea57c545a (patch)
tree2e51d83ce65db1e18061c2125ab0c24d182168c6 /usr/src
parent712a34becd0c378dd87ef9106ed5275739e2521a (diff)
downloadillumos-joyent-9c88ac3ab4edaa5e8c0130ed1b4b376ea57c545a.tar.gz
8852 libcurses: local unused types
Reviewed by: Gary Mills <gary_mills@fastmail.fm> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/libcurses/screen/tgetch.c4
-rw-r--r--usr/src/lib/libcurses/screen/typeahead.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/usr/src/lib/libcurses/screen/tgetch.c b/usr/src/lib/libcurses/screen/tgetch.c
index 20f6995a6b..61b293cce9 100644
--- a/usr/src/lib/libcurses/screen/tgetch.c
+++ b/usr/src/lib/libcurses/screen/tgetch.c
@@ -41,6 +41,9 @@
#include "curses_inc.h"
#include <signal.h>
#include <unistd.h>
+#ifndef FIONREAD
+#include <fcntl.h>
+#endif /* FIONREAD */
#ifdef DEBUG
#include <ctype.h>
#endif /* DEBUG */
@@ -533,7 +536,6 @@ _fpk(void)
if (cur_term->_check_fd != -1)
rc = read(cur_term->_check_fd, (char *)&c, 1);
else {
-#include <fcntl.h>
int fcflags = fcntl(infd, F_GETFL, 0);
(void) fcntl(infd, F_SETFL, fcflags | O_NDELAY);
diff --git a/usr/src/lib/libcurses/screen/typeahead.c b/usr/src/lib/libcurses/screen/typeahead.c
index 0d343b7539..5353b14638 100644
--- a/usr/src/lib/libcurses/screen/typeahead.c
+++ b/usr/src/lib/libcurses/screen/typeahead.c
@@ -37,13 +37,14 @@
* contributors.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*LINTLIBRARY*/
#include <unistd.h>
#include <sys/types.h>
#include "curses_inc.h"
+#ifdef SYSV
+#include <fcntl.h>
+#endif /* SYSV */
/*
* Set the file descriptor for typeahead checks to fd. fd can be -1
@@ -62,7 +63,6 @@ typeahead(int fd)
* 9.2% of the time in fcntl().
*/
-#include <fcntl.h>
int savefd = cur_term->_check_fd;
/* Close the previous duped file descriptor. */