summaryrefslogtreecommitdiff
path: root/src/utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/utils.c')
-rw-r--r--src/utils.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/utils.c b/src/utils.c
index ce8ca26..3cc7d97 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -64,8 +64,10 @@ as that of the covered work. */
#include <sys/stat.h>
/* For TIOCGWINSZ and friends: */
-#include <sys/ioctl.h>
-#include <termios.h>
+#ifndef WINDOWS
+# include <sys/ioctl.h>
+# include <termios.h>
+#endif
/* Needed for Unix version of run_with_timeout. */
#include <signal.h>
@@ -1810,7 +1812,7 @@ determine_screen_width (void)
int fd;
struct winsize wsz;
- if (opt.lfilename != NULL)
+ if (opt.lfilename != NULL && opt.show_progress != 1)
return 0;
fd = fileno (stderr);