summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2016-04-13 09:42:41 +0000
committerschwarze <schwarze@openbsd.org>2016-04-13 09:42:41 +0000
commit0a662d04499789a901a4983c968dc7119c1a81ba (patch)
tree88543ed222db64a9a7d448fcb74b43e4dbcce470
parentKeep all pools in the same place. (diff)
downloadwireguard-openbsd-0a662d04499789a901a4983c968dc7119c1a81ba.tar.xz
wireguard-openbsd-0a662d04499789a901a4983c968dc7119c1a81ba.zip
Re-introduce the following commit:
OpenBSD read.c rev. 1.4 1997/06/10 20:10:13 millert FIONREAD takes int *, not long * It got lost in the following merge from NetBSD: OpenBSD read.c rev. 1.10 2003/10/31 08:42:24 otto OK millert@ martijn@
-rw-r--r--lib/libedit/read.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index ba75562a012..d1b1f6d7283 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: read.c,v 1.37 2016/04/12 09:07:21 schwarze Exp $ */
+/* $OpenBSD: read.c,v 1.38 2016/04/13 09:42:41 schwarze Exp $ */
/* $NetBSD: read.c,v 1.92 2016/04/12 00:16:06 christos Exp $ */
/*-
@@ -468,7 +468,7 @@ el_wgets(EditLine *el, int *nread)
#ifdef FIONREAD
if (el->el_tty.t_mode == EX_IO && el->el_chared.c_macro.level < 0) {
- long chrs = 0;
+ int chrs = 0;
(void) ioctl(el->el_infd, FIONREAD, &chrs);
if (chrs == 0) {