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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 290b83a7ecf2e15635eff259832cbfe228dd645e..fb262a6efb07851f034453715170035faab574dc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-14  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
+
+       * keyboard.c (make_ctrl_char) [HAVE_NTGUI]: Now externally visible
+       for Cygwin w32 build.
+
+       * xdisp.c (erase_phys_cursor) [HAVE_NTGUI]: Now externally visible
+       for Cygwin w32 build.  (Bug#15892)
+
 2013-11-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify, port and tune bool vector implementation.

diff --git a/src/keyboard.c b/src/keyboard.c
index 0fcea387aea01d9de99198e5e6af85af5f898627..450592a07b697fd8fc5a307ba182d9f37779bfdd 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2086,7 +2086,7 @@ bind_polling_period (int n)
 \f
 /* Apply the control modifier to CHARACTER.  */
 
-#ifndef WINDOWSNT
+#ifndef HAVE_NTGUI
 static
 #endif
 int

diff --git a/src/xdisp.c b/src/xdisp.c
index d6269f244130d68ac5434be47741a5f18c431d3b..47855a1de3c6d3109c50b81396a7a431a8b763e7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26345,7 +26345,7 @@ draw_phys_cursor_glyph (struct window *w, struct glyph_row *row,
 
 /* Erase the image of a cursor of window W from the screen.  */
 
-#ifndef WINDOWSNT
+#ifndef HAVE_NTGUI
 static
 #endif
 void