From 3c5c2aa69edf799cfb5fb225b54fce50c967aec3 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Wed, 7 Aug 2019 11:47:03 +0200
Subject: [PATCH] Fixes the Cygwin build

---
 ChangeLog                  | 3 +++
 src/ftermdetection.cpp     | 4 ++++
 src/ftermxterminal.cpp     | 4 ++++
 src/ftextview.cpp          | 5 +++++
 src/include/final/fvterm.h | 4 ----
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b4bd903..bf54ec61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-08-07  Markus Gans  <guru.mail@muenster.de>
+	* Fixes the Cygwin build
+
 2019-08-04  Markus Gans  <guru.mail@muenster.de>
 	* Reduce the number of interface parameters
 
diff --git a/src/ftermdetection.cpp b/src/ftermdetection.cpp
index 5b307fb6..b617356f 100644
--- a/src/ftermdetection.cpp
+++ b/src/ftermdetection.cpp
@@ -20,6 +20,10 @@
 * <http://www.gnu.org/licenses/>.                                      *
 ***********************************************************************/
 
+#if defined(__CYGWIN__)
+  #include "final/fconfig.h"  // includes _GNU_SOURCE for fd_set
+#endif
+
 #include "final/emptyfstring.h"
 #include "final/fc.h"
 #include "final/fconfig.h"
diff --git a/src/ftermxterminal.cpp b/src/ftermxterminal.cpp
index d9bb5701..400c7eb6 100644
--- a/src/ftermxterminal.cpp
+++ b/src/ftermxterminal.cpp
@@ -20,6 +20,10 @@
 * <http://www.gnu.org/licenses/>.                                      *
 ***********************************************************************/
 
+#if defined(__CYGWIN__)
+  #include "final/fconfig.h"  // includes _GNU_SOURCE for fd_set
+#endif
+
 #include "final/fc.h"
 #include "final/fstring.h"
 #include "final/fterm.h"
diff --git a/src/ftextview.cpp b/src/ftextview.cpp
index a15c91a5..9990f38a 100644
--- a/src/ftextview.cpp
+++ b/src/ftextview.cpp
@@ -20,6 +20,11 @@
 * <http://www.gnu.org/licenses/>.                                      *
 ***********************************************************************/
 
+#if defined(__CYGWIN__)
+  #include "final/fconfig.h"  // includes _GNU_SOURCE for wcwidth()
+#endif
+
+#include <wchar.h>
 #include <memory>
 
 #include "final/fapplication.h"
diff --git a/src/include/final/fvterm.h b/src/include/final/fvterm.h
index b3635ded..64030eab 100644
--- a/src/include/final/fvterm.h
+++ b/src/include/final/fvterm.h
@@ -48,10 +48,6 @@
   #error "Only <final/final.h> can be included directly."
 #endif
 
-#if defined(__CYGWIN__)
-  #include "final/fconfig.h"  // includes _GNU_SOURCE for wcwidth()
-#endif
-
 #include <queue>
 #include <sstream>  // std::stringstream
 #include <string>