[Emacs-diffs] /srv/bzr/emacs/trunk r110735: Complete fix for build break

[Daniel Colascione]

------------------------------------------------------------
revno: 110735
committer: Daniel Colascione <address@hidden>
branch nick: cyg
timestamp: Mon 2012-10-29 19:10:52 -0800
message:
  Complete fix for build break
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-29 17:24:29 +0000
+++ b/src/ChangeLog     2012-10-30 03:10:52 +0000
@@ -5,8 +5,8 @@
        here...
 
        * coding.h, coding.c: ... to here, and compile them only when
-       WINDOWSNT or HAVE_NTGUI.  Moving these functions out of cygw32
-       proper lets us write cygw32-agnostic code for the HAVE_NTGUI case.
+       WINDOWSNT or CYGWIN.  Moving these functions out of cygw32 proper
+       lets us write cygw32-agnostic code for the HAVE_NTGUI case.
 
 2012-10-28  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-10-30 01:56:38 +0000
+++ b/src/coding.c      2012-10-30 03:10:52 +0000
@@ -343,7 +343,7 @@
 Lisp_Object Qemacs_mule, Qraw_text;
 Lisp_Object Qutf_8_emacs;
 
-#if defined (WINDOWSNT) || defined (HAVE_NTGUI)
+#if defined (WINDOWSNT) || defined (CYGWIN)
 static Lisp_Object Qutf_16le;
 #endif