[Emacs-diffs] /srv/bzr/emacs/trunk r110734: Fix build break in non-Cygw32 Cygwin builds introduced in revision 110729.

[Daniel Colascione]

------------------------------------------------------------
revno: 110734
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-29 17:56:38 -0800
message:
  Fix build break in non-Cygw32 Cygwin builds introduced in revision 110729.
modified:
  src/coding.c
  src/coding.h

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-10-29 17:24:29 +0000
+++ b/src/coding.c      2012-10-30 01:56:38 +0000
@@ -7975,7 +7975,7 @@
   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 @@
   *buf = str;
   return WCSDATA (*buf);
 }
-#endif /* WINDOWSNT || HAVE_NTGUI */
+
+#endif /* WINDOWSNT || CYGWIN */
 
 
 #ifdef emacs
@@ -10321,7 +10322,7 @@
   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

=== modified file 'src/coding.h'
--- a/src/coding.h      2012-10-29 17:24:29 +0000
+++ b/src/coding.h      2012-10-30 01:56:38 +0000
@@ -701,7 +701,7 @@
                                   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 @@
    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.  */