X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fusage.c;fp=ccan%2Fopt%2Fusage.c;h=ef33f9188dd304f41b12f19c6bbd29b3f8a69849;hp=1142fb85c9c91ca091172d8971fe58101d0beca6;hb=d218dcd458cbec7a1b958af39b70cd068da7b040;hpb=9273220c47005235da7cfed1221e13dd19065093

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index 1142fb85..ef33f918 100644
--- 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>
+#ifdef HAVE_SYS_TERMIOS_H
 #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>
@@ -17,19 +19,23 @@ const char opt_hidden[1];
 
 static unsigned int get_columns(void)
 {
-	struct winsize w;
+	int ws_col = 0;
 	const char *env = getenv("COLUMNS");
 
-	w.ws_col = 0;
 	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 HAVE_SYS_TERMIOS_H
+	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.