opt: test HAVE_SYS_TERMIOS_H via #if

[ccan] / ccan / opt / usage.c

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 1142fb85c9c91ca091172d8971fe58101d0beca6..ff0545591ed4050a5153aa5c8d6db2041a1295e4 100644 (file)
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -1,7 +1,9 @@
 /* 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>

+#if HAVE_SYS_TERMIOS_H

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

+#endif

 #include <sys/unistd.h> /* Required on Solaris for ioctl */
 #include <string.h>
 #include <stdlib.h>
 #include <sys/unistd.h> /* Required on Solaris for ioctl */
 #include <string.h>
 #include <stdlib.h>


@@ -17,19 +19,24 @@ const char opt_hidden[1];
 
 static unsigned int get_columns(void)
 {
 
 static unsigned int get_columns(void)
 {

-       struct winsize w;
+       int ws_col = 0;

        const char *env = getenv("COLUMNS");
 
        const char *env = getenv("COLUMNS");
 

-       w.ws_col = 0;

        if (env)
        if (env)

-               w.ws_col = atoi(env);
-       if (!w.ws_col)
-               if (ioctl(0, TIOCGWINSZ, &w) == -1)
-                       w.ws_col = 0;
-       if (!w.ws_col)
-               w.ws_col = 80;
-
-       return w.ws_col;
+               ws_col = atoi(env);
+
+#ifdef TIOCGWINSZ
+       if (!ws_col)
+       {
+               struct winsize w;
+               if (ioctl(0, TIOCGWINSZ, &w) != -1)
+                       ws_col = w.ws_col;
+       }
+#endif
+       if (!ws_col)
+               ws_col = 80;
+
+       return ws_col;

 }
 
 /* Return number of chars of words to put on this line.
 }
 
 /* Return number of chars of words to put on this line.