--- origsrc/libedit-20130712-3.1/src/chartype.h	2012-03-11 10:54:58.000000000 +0100
+++ src/libedit-20130712-3.1/src/chartype.h	2013-10-20 13:54:52.166608497 +0200
@@ -56,9 +56,11 @@
 /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
  * ref: ISO/IEC DTR 19769
  */
+#ifndef __CYGWIN__
 #if WCHAR_MAX < INT32_MAX
 #warning Build environment does not support non-BMP characters
 #endif
+#endif
 
 #ifndef HAVE_WCSDUP
 wchar_t *wcsdup(const wchar_t *s);
--- origsrc/libedit-20130712-3.1/src/editline/readline.h	2013-06-01 17:46:07.000000000 +0200
+++ src/libedit-20130712-3.1/src/editline/readline.h	2013-10-20 13:54:52.202608341 +0200
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
 
 #ifndef CTRL
 #include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__)
 #include <sys/ttydefaults.h>
 #endif
 #ifndef CTRL