diff --git a/builtin_set_color.cpp b/builtin_set_color.cpp index 14cf84c..3edfb92 100644 --- a/builtin_set_color.cpp +++ b/builtin_set_color.cpp @@ -9,11 +9,15 @@ Functions used for implementing the set_color builtin. #include "color.h" #include "output.h" +#if defined(__CYGWIN__) +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/common.cpp b/common.cpp index 0ac8436..a9b6bee 100644 --- a/common.cpp +++ b/common.cpp @@ -45,12 +45,15 @@ parts of fish. #include #endif - +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/env.cpp b/env.cpp index 55d1032..860f9c3 100644 --- a/env.cpp +++ b/env.cpp @@ -19,11 +19,15 @@ #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/env_universal.cpp b/env_universal.cpp index c7d060a..1849980 100644 --- a/env_universal.cpp +++ b/env_universal.cpp @@ -13,11 +13,15 @@ #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/expand.cpp b/expand.cpp index 74e5010..a9a2b2f 100644 --- a/expand.cpp +++ b/expand.cpp @@ -18,7 +18,9 @@ parameter expansion. #include #include #include +#ifndef __CYGWIN__ #include +#endif #include #include #include diff --git a/fallback.cpp b/fallback.cpp index 7e215bb..8a4aaf2 100644 --- a/fallback.cpp +++ b/fallback.cpp @@ -31,11 +31,15 @@ #include #endif +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/fallback.h b/fallback.h index eba91be..fc4cb15 100644 --- a/fallback.h +++ b/fallback.h @@ -93,8 +93,10 @@ int tputs(const char *str, int affcnt, int (*fish_putc)(tputs_arg_t)); work around this here. */ +#ifndef __CYGWIN__ #define tparm tparm_solaris_kludge char *tparm_solaris_kludge(char *str, ...); +#endif #endif diff --git a/fish_pager.cpp b/fish_pager.cpp index 2e1a4bb..b5f91f5 100644 --- a/fish_pager.cpp +++ b/fish_pager.cpp @@ -23,11 +23,15 @@ #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/input.cpp b/input.cpp index 6127e23..4cc1fe9 100644 --- a/input.cpp +++ b/input.cpp @@ -22,11 +22,15 @@ #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/io.cpp b/io.cpp index da1ebb0..dd14561 100644 --- a/io.cpp +++ b/io.cpp @@ -22,11 +22,15 @@ Utilities for io redirection. #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/output.cpp b/output.cpp index 855eecd..13ce4b0 100644 --- a/output.cpp +++ b/output.cpp @@ -20,11 +20,15 @@ #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/proc.cpp b/proc.cpp index 749f38c..77b7a03 100644 --- a/proc.cpp +++ b/proc.cpp @@ -31,11 +31,15 @@ Some of the code in this file is based on code from the Glibc manual. #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/reader.cpp b/reader.cpp index c3e1e5b..039c3eb 100644 --- a/reader.cpp +++ b/reader.cpp @@ -43,11 +43,15 @@ commence. #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include diff --git a/screen.cpp b/screen.cpp index 68f78ad..2c8231c 100644 --- a/screen.cpp +++ b/screen.cpp @@ -18,11 +18,15 @@ efficient way for transforming that to the desired screen content. #include #include +#ifdef __CYGWIN__ +#include +#else #if HAVE_NCURSES_H #include #else #include #endif +#endif #if HAVE_TERM_H #include