[Bug-readline] Fwd: [PATCH] readline: rltty.c: Declare ioctl() explicitly.

[Chen Gang]

-------- Forwarded Message --------
Subject: [PATCH] readline: rltty.c: Declare ioctl() explicitly.
Date: Sun, 19 Apr 2015 22:26:05 +0800
From: Chen Gang <address@hidden>
To: address@hidden, address@hidden <address@hidden>

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  <address@hidden>

        * rltty.c: Declare ioctl() explicitly.
---
 readline/ChangeLog.gdb | 4 ++++
 readline/rltty.c       | 4 ++++
 2 files changed, 8 insertions(+)

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  <address@hidden>
 
+       * rltty.c: Declare ioctl() explicitly.
+
+2015-04-19  Chen Gang  <address@hidden>
+
        * rlmbutil.h: Declare wcwidth() when HANDLE_MULTIBYTE enabled.
 
 2014-12-30  Eli Zaretskii  <address@hidden>
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"
-- 
1.9.3