diff options
| author | Daniel Colascione | 2012-10-29 19:10:52 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-29 19:10:52 -0800 |
| commit | 53372c278e7e79b97aed97b159a00bde45de3a80 (patch) | |
| tree | bbfda67459595a3c4c16413c8fc80099a3ddf071 /src | |
| parent | 7f590b0c3b25602499432bf986e7b593fc158c0b (diff) | |
| download | emacs-53372c278e7e79b97aed97b159a00bde45de3a80.tar.gz emacs-53372c278e7e79b97aed97b159a00bde45de3a80.zip | |
Complete fix for build break
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/coding.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c76bbb5a260..831af6c58a2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -5,8 +5,8 @@ | |||
| 5 | here... | 5 | here... |
| 6 | 6 | ||
| 7 | * coding.h, coding.c: ... to here, and compile them only when | 7 | * coding.h, coding.c: ... to here, and compile them only when |
| 8 | WINDOWSNT or HAVE_NTGUI. Moving these functions out of cygw32 | 8 | WINDOWSNT or CYGWIN. Moving these functions out of cygw32 proper |
| 9 | proper lets us write cygw32-agnostic code for the HAVE_NTGUI case. | 9 | lets us write cygw32-agnostic code for the HAVE_NTGUI case. |
| 10 | 10 | ||
| 11 | 2012-10-28 Eli Zaretskii <eliz@gnu.org> | 11 | 2012-10-28 Eli Zaretskii <eliz@gnu.org> |
| 12 | 12 | ||
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; | |||
| 343 | Lisp_Object Qemacs_mule, Qraw_text; | 343 | Lisp_Object Qemacs_mule, Qraw_text; |
| 344 | Lisp_Object Qutf_8_emacs; | 344 | Lisp_Object Qutf_8_emacs; |
| 345 | 345 | ||
| 346 | #if defined (WINDOWSNT) || defined (HAVE_NTGUI) | 346 | #if defined (WINDOWSNT) || defined (CYGWIN) |
| 347 | static Lisp_Object Qutf_16le; | 347 | static Lisp_Object Qutf_16le; |
| 348 | #endif | 348 | #endif |
| 349 | 349 | ||