diff options
| author | Daniel Colascione | 2012-10-29 17:56:38 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-29 17:56:38 -0800 |
| commit | 7f590b0c3b25602499432bf986e7b593fc158c0b (patch) | |
| tree | b8d582dbf2b848a4e9d7a998092a2eb31afe52cf /src/coding.c | |
| parent | e29e39c9c6aee68a50fef5149cc3acdfa74fec72 (diff) | |
| download | emacs-7f590b0c3b25602499432bf986e7b593fc158c0b.tar.gz emacs-7f590b0c3b25602499432bf986e7b593fc158c0b.zip | |
Fix build break in non-Cygw32 Cygwin builds introduced in 2012-10-29T17:24:29Z!dancol@dancol.org.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/coding.c b/src/coding.c index 611f92ea152..97268e0dcd8 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7975,7 +7975,7 @@ preferred_coding_system (void) | |||
| 7975 | return CODING_ID_NAME (id); | 7975 | return CODING_ID_NAME (id); |
| 7976 | } | 7976 | } |
| 7977 | 7977 | ||
| 7978 | #if defined (WINDOWSNT) || defined (HAVE_NTGUI) | 7978 | #if defined (WINDOWSNT) || defined (CYGWIN) |
| 7979 | 7979 | ||
| 7980 | Lisp_Object | 7980 | Lisp_Object |
| 7981 | from_unicode (Lisp_Object str) | 7981 | from_unicode (Lisp_Object str) |
| @@ -8006,7 +8006,8 @@ to_unicode (Lisp_Object str, Lisp_Object *buf) | |||
| 8006 | *buf = str; | 8006 | *buf = str; |
| 8007 | return WCSDATA (*buf); | 8007 | return WCSDATA (*buf); |
| 8008 | } | 8008 | } |
| 8009 | #endif /* WINDOWSNT || HAVE_NTGUI */ | 8009 | |
| 8010 | #endif /* WINDOWSNT || CYGWIN */ | ||
| 8010 | 8011 | ||
| 8011 | 8012 | ||
| 8012 | #ifdef emacs | 8013 | #ifdef emacs |
| @@ -10321,7 +10322,7 @@ syms_of_coding (void) | |||
| 10321 | DEFSYM (Qutf_8, "utf-8"); | 10322 | DEFSYM (Qutf_8, "utf-8"); |
| 10322 | DEFSYM (Qutf_8_emacs, "utf-8-emacs"); | 10323 | DEFSYM (Qutf_8_emacs, "utf-8-emacs"); |
| 10323 | 10324 | ||
| 10324 | #if defined (WINDOWSNT) || defined (HAVE_NTGUI) | 10325 | #if defined (WINDOWSNT) || defined (CYGWIN) |
| 10325 | /* No, not utf-16-le: that one has a BOM. */ | 10326 | /* No, not utf-16-le: that one has a BOM. */ |
| 10326 | DEFSYM (Qutf_16le, "utf-16le"); | 10327 | DEFSYM (Qutf_16le, "utf-16le"); |
| 10327 | #endif | 10328 | #endif |