From: Ken Brown <kbrown@cornell.edu>
Date: Wed, 11 Dec 2013 16:52:34 +0000 (-0500)
Subject: Fix conditions for prototype declarations.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~471
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1421be8445803bdb9c3fece8c658836b5f0f9c34;p=emacs.git

Fix conditions for prototype declarations.

* src/dispextern.h (erase_phys_cursor):
* src/keyboard.h (make_ctrl_char): Declare prototypes if HAVE_NTGUI.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f3161a220d..89c640bd8c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-11  Ken Brown  <kbrown@cornell.edu>
+
+	* dispextern.h (erase_phys_cursor):
+	* keyboard.h (make_ctrl_char): Declare prototypes if HAVE_NTGUI.
+
 2013-12-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* nsterm.m (x_free_frame_resources):
diff --git a/src/dispextern.h b/src/dispextern.h
index 7de4edf2196..5976d068a78 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3251,7 +3251,7 @@ extern void draw_phys_cursor_glyph (struct window *,
                                     enum draw_glyphs_face);
 extern void get_phys_cursor_geometry (struct window *, struct glyph_row *,
                                       struct glyph *, int *, int *, int *);
-#ifdef WINDOWSNT
+#if HAVE_NTGUI
 extern void erase_phys_cursor (struct window *);
 #endif
 extern void display_and_set_cursor (struct window *, bool, int, int, int, int);
diff --git a/src/keyboard.h b/src/keyboard.h
index a1aa59fe988..33a2d535cd6 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -518,7 +518,7 @@ extern bool input_polling_used (void);
 extern void clear_input_pending (void);
 extern bool requeued_events_pending_p (void);
 extern void bind_polling_period (int);
-#ifdef WINDOWSNT
+#if HAVE_NTGUI
 extern int make_ctrl_char (int) ATTRIBUTE_CONST;
 #endif
 extern void stuff_buffered_input (Lisp_Object);