Fix build break in non-Cygw32 Cygwin builds introduced in 2012-10-29T17:24:29Z!dancol...

diff --git a/src/coding.c b/src/coding.c
index 611f92ea15255fb610c5409a6a9b1f3f91f50f2b..97268e0dcd80db74f13badba7dbe19c8c34b9000 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -7975,7 +7975,7 @@ preferred_coding_system (void)
   return CODING_ID_NAME (id);
 }
 
-#if defined (WINDOWSNT) || defined (HAVE_NTGUI)
+#if defined (WINDOWSNT) || defined (CYGWIN)
 
 Lisp_Object
 from_unicode (Lisp_Object str)
@@ -8006,7 +8006,8 @@ to_unicode (Lisp_Object str, Lisp_Object *buf)
   *buf = str;
   return WCSDATA (*buf);
 }
-#endif /* WINDOWSNT || HAVE_NTGUI */
+
+#endif /* WINDOWSNT || CYGWIN */
 
 \f
 #ifdef emacs
@@ -10321,7 +10322,7 @@ syms_of_coding (void)
   DEFSYM (Qutf_8, "utf-8");
   DEFSYM (Qutf_8_emacs, "utf-8-emacs");
 
-#if defined (WINDOWSNT) || defined (HAVE_NTGUI)
+#if defined (WINDOWSNT) || defined (CYGWIN)
   /* No, not utf-16-le: that one has a BOM.  */
   DEFSYM (Qutf_16le, "utf-16le");
 #endif

diff --git a/src/coding.h b/src/coding.h
index 6ba5f8e0e1e2df74cbe0535b29459f98c901d5c8..192be58f08328c2923ac102b9c05ec978fcb3e7e 100644 (file)
--- a/src/coding.h
+++ b/src/coding.h
@@ -701,7 +701,7 @@ extern void encode_coding_object (struct coding_system *,
                                   Lisp_Object, ptrdiff_t, ptrdiff_t,
                                   ptrdiff_t, ptrdiff_t, Lisp_Object);
 
-#if defined (WINDOWSNT) || defined (HAVE_NTGUI)
+#if defined (WINDOWSNT) || defined (CYGWIN)
 
 /* These functions use Lisp string objects to store the UTF-16LE
    strings that modern versions of Windows expect.  These strings are
@@ -721,7 +721,7 @@ extern wchar_t *to_unicode (Lisp_Object str, Lisp_Object *buf);
    failure modes.  STR itself is not modified.  */
 extern Lisp_Object from_unicode (Lisp_Object str);
 
-#endif /* WINDOWSNT || HAVE_NTGUI */
+#endif /* WINDOWSNT || CYGWIN */
 
 /* Macros for backward compatibility.  */