Patchwork readline: rltty.c: Declare ioctl() explicitly.

login
register
mail settings
Submitter Chen Gang
Date April 19, 2015, 2:26 p.m.
Message ID <BLU436-SMTP115C989365A0C460ADEB606B9E10@phx.gbl>
Download mbox | patch
Permalink /patch/6322/
State New
Headers show

Comments

Chen Gang - April 19, 2015, 2:26 p.m.
Under Darwin, ioctl() is declared in "sys/ioctl.h", but except for some
special control commands, we do not want to include "sys/ioctl.h". So
declare it explicitly, the related warning:

  gcc -c -DHAVE_CONFIG_H    -I. -I../../binutils-gdb/readline -DRL_LIBRARY_VERSION='"6.2"' -g -O2 ../../binutils-gdb/readline/rltty.c
  ../../binutils-gdb/readline/rltty.c: In function 'set_winsize':
  ../../binutils-gdb/readline/rltty.c:83:7: warning: implicit declaration of function 'ioctl' [-Wimplicit-function-declaration]
     if (ioctl (tty, TIOCGWINSZ, &w) == 0)
         ^

2015-04-19  Chen Gang  <gang.chen.5i5j@gmail.com>

	* rltty.c: Declare ioctl() explicitly.
---
 readline/ChangeLog.gdb | 4 ++++
 readline/rltty.c       | 4 ++++
 2 files changed, 8 insertions(+)
Mike Frysinger - April 19, 2015, 4:46 p.m.
On 19 Apr 2015 22:26, Chen Gang wrote:
> Under Darwin, ioctl() is declared in "sys/ioctl.h", but except for some
> special control commands, we do not want to include "sys/ioctl.h". So
> declare it explicitly, the related warning:

readline patches should be sent to the readline project:
https://lists.gnu.org/mailman/listinfo/bug-readline
-mike
Chen Gang - April 19, 2015, 5:45 p.m.
On 4/20/15 00:46, Mike Frysinger wrote:
> On 19 Apr 2015 22:26, Chen Gang wrote:
>> Under Darwin, ioctl() is declared in "sys/ioctl.h", but except for some
>> special control commands, we do not want to include "sys/ioctl.h". So
>> declare it explicitly, the related warning:
> 
> readline patches should be sent to the readline project:
> https://lists.gnu.org/mailman/listinfo/bug-readline
> -mike
> 

OK, thanks. I shall send it to bug-readline@gnu.org, next.

Patch

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index a1051aa..dac2a2b 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,5 +1,9 @@ 
 2015-04-19  Chen Gang  <gang.chen.5i5j@gmail.com>
 
+	* rltty.c: Declare ioctl() explicitly.
+
+2015-04-19  Chen Gang  <gang.chen.5i5j@gmail.com>
+
 	* rlmbutil.h: Declare wcwidth() when HANDLE_MULTIBYTE enabled.
 
 2014-12-30  Eli Zaretskii  <eliz@gnu.org>
diff --git a/readline/rltty.c b/readline/rltty.c
index d237b1c..ed9c91b 100644
--- a/readline/rltty.c
+++ b/readline/rltty.c
@@ -39,6 +39,10 @@ 
 
 #if defined (GWINSZ_IN_SYS_IOCTL)
 #  include <sys/ioctl.h>
+#else
+int ioctl(int, unsigned long, ...); /* For Darwin, ioctl() is in "sys/ioctl.h",
+				       but except for special control commands,
+				       we do not want to include it.  */
 #endif /* GWINSZ_IN_SYS_IOCTL */
 
 #include "rltty.h"