diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-10-29 17:56:38 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-10-29 17:56:38 -0800 |
| commit | 7f590b0c3b25602499432bf986e7b593fc158c0b (patch) | |
| tree | b8d582dbf2b848a4e9d7a998092a2eb31afe52cf /src | |
| parent | e29e39c9c6aee68a50fef5149cc3acdfa74fec72 (diff) | |
| download | emacs-7f590b0c3b25602499432bf986e7b593fc158c0b.tar.gz | |
Fix build break in non-Cygw32 Cygwin builds introduced in 2012-10-29T17:24:29Z!dancol@dancol.org.
Diffstat (limited to 'src')
| -rw-r--r-- | src/coding.c | 7 | ||||
| -rw-r--r-- | src/coding.h | 4 |
2 files changed, 6 insertions, 5 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) 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 @@ to_unicode (Lisp_Object str, Lisp_Object *buf) *buf = str; return WCSDATA (*buf); } -#endif /* WINDOWSNT || HAVE_NTGUI */ + +#endif /* WINDOWSNT || CYGWIN */ #ifdef emacs @@ -10321,7 +10322,7 @@ syms_of_coding (void) 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 diff --git a/src/coding.h b/src/coding.h index 6ba5f8e0e1e..192be58f083 100644 --- a/src/coding.h +++ b/src/coding.h @@ -701,7 +701,7 @@ extern void encode_coding_object (struct coding_system *, 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 @@ extern wchar_t *to_unicode (Lisp_Object str, Lisp_Object *buf); 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. */ |