diff options
| author | Kazuhiro Ito | 2013-11-14 19:43:49 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-11-14 19:43:49 +0200 |
| commit | c9f630705d1f24c326f6ddaf28426efbce99788f (patch) | |
| tree | 86f47e6d5632ebe6c0946e7a66256f500b2b1e6c /src | |
| parent | 0d5363c4cdc0de80137744f2c2445606042cf2cd (diff) | |
| download | emacs-c9f630705d1f24c326f6ddaf28426efbce99788f.tar.gz emacs-c9f630705d1f24c326f6ddaf28426efbce99788f.zip | |
Fix bug #15892 with link failures of the Cygwin w32 build.
src/keyboard.c (make_ctrl_char) [HAVE_NTGUI]: Now externally visible
for Cygwin w32 build.
src/xdisp.c (erase_phys_cursor) [HAVE_NTGUI]: Now externally visible
for Cygwin w32 build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/keyboard.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 290b83a7ecf..fb262a6efb0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2013-11-14 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) | ||
| 2 | |||
| 3 | * keyboard.c (make_ctrl_char) [HAVE_NTGUI]: Now externally visible | ||
| 4 | for Cygwin w32 build. | ||
| 5 | |||
| 6 | * xdisp.c (erase_phys_cursor) [HAVE_NTGUI]: Now externally visible | ||
| 7 | for Cygwin w32 build. (Bug#15892) | ||
| 8 | |||
| 1 | 2013-11-14 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2013-11-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 10 | ||
| 3 | Simplify, port and tune bool vector implementation. | 11 | Simplify, port and tune bool vector implementation. |
diff --git a/src/keyboard.c b/src/keyboard.c index 0fcea387aea..450592a07b6 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -2086,7 +2086,7 @@ bind_polling_period (int n) | |||
| 2086 | 2086 | ||
| 2087 | /* Apply the control modifier to CHARACTER. */ | 2087 | /* Apply the control modifier to CHARACTER. */ |
| 2088 | 2088 | ||
| 2089 | #ifndef WINDOWSNT | 2089 | #ifndef HAVE_NTGUI |
| 2090 | static | 2090 | static |
| 2091 | #endif | 2091 | #endif |
| 2092 | int | 2092 | int |
diff --git a/src/xdisp.c b/src/xdisp.c index d6269f24413..47855a1de3c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -26345,7 +26345,7 @@ draw_phys_cursor_glyph (struct window *w, struct glyph_row *row, | |||
| 26345 | 26345 | ||
| 26346 | /* Erase the image of a cursor of window W from the screen. */ | 26346 | /* Erase the image of a cursor of window W from the screen. */ |
| 26347 | 26347 | ||
| 26348 | #ifndef WINDOWSNT | 26348 | #ifndef HAVE_NTGUI |
| 26349 | static | 26349 | static |
| 26350 | #endif | 26350 | #endif |
| 26351 | void | 26351 | void |