opt: test HAVE_SYS_TERMIOS_H via #if

As ccanlint warns.  Also, test TIOCGWINSZ before ioctl, rather than the
header directly since it's a little orthogonal.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index ef33f9188dd304f41b12f19c6bbd29b3f8a69849..ff0545591ed4050a5153aa5c8d6db2041a1295e4 100644 (file)
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -1,6 +1,6 @@
 /* Licensed under GPLv3+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 /* Licensed under GPLv3+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>

-#ifdef HAVE_SYS_TERMIOS_H
+#if HAVE_SYS_TERMIOS_H

 #include <sys/ioctl.h>
 #include <sys/termios.h> /* Required on Solaris for struct winsize */
 #endif
 #include <sys/ioctl.h>
 #include <sys/termios.h> /* Required on Solaris for struct winsize */
 #endif


@@ -24,7 +24,8 @@ static unsigned int get_columns(void)
 
        if (env)
                ws_col = atoi(env);
 
        if (env)
                ws_col = atoi(env);

-#ifdef HAVE_SYS_TERMIOS_H
+
+#ifdef TIOCGWINSZ

        if (!ws_col)
        {
                struct winsize w;
        if (!ws_col)
        {
                struct winsize w;