From: Kazuhiro Ito <kzhr@d1.dion.ne.jp>
Date: Thu, 14 Nov 2013 17:43:49 +0000 (+0200)
Subject: Fix bug #15892 with link failures of the Cygwin w32 build.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~826
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9f630705d1f24c326f6ddaf28426efbce99788f;p=emacs.git

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 290b83a7ecf..fb262a6efb0 100644
--- 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 0fcea387aea..450592a07b6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2086,7 +2086,7 @@ bind_polling_period (int n)
 
 /* 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 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,
 
 /* Erase the image of a cursor of window W from the screen.  */
 
-#ifndef WINDOWSNT
+#ifndef HAVE_NTGUI
 static
 #endif
 void