From: Daniel Colascione Date: Tue, 30 Oct 2012 03:10:52 +0000 (-0800) Subject: Complete fix for build break X-Git-Tag: emacs-24.2.90~209^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53372c278e7e79b97aed97b159a00bde45de3a80;p=emacs.git Complete fix for build break --- diff --git a/src/ChangeLog b/src/ChangeLog index c76bbb5a260..831af6c58a2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/coding.c b/src/coding.c index 97268e0dcd8..56202e4861d 100644 --- a/src/coding.c +++ b/src/coding.c @@ -343,7 +343,7 @@ Lisp_Object Qcoding_system_p, Qcoding_system_error; 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