From: Ken Brown <kbrown@cornell.edu>
Date: Mon, 9 Dec 2013 20:46:07 +0000 (-0500)
Subject: Fix declaration of get_frame_param for cygw32 build.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~493
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=336fe071e5d1587d39e002a87a562028ec9cbbe4;p=emacs.git

Fix declaration of get_frame_param for cygw32 build.

* src/frame.c (get_frame_param): Make extern if HAVE_NTGUI.

* src/lisp.h (get_frame_param): Adjust conditions for prototype
declaration.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0970bf62b52..520261857df 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-09  Ken Brown  <kbrown@cornell.edu>
+
+	* frame.c (get_frame_param): Make extern if HAVE_NTGUI.
+
+	* lisp.h (get_frame_param): Adjust conditions for prototype
+	declaration.
+
 2013-12-09  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
diff --git a/src/frame.c b/src/frame.c
index e13c3768e12..43e549235df 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1929,7 +1929,7 @@ If there is no window system support, this function does nothing.  */)
 /* Return the value of frame parameter PROP in frame FRAME.  */
 
 #ifdef HAVE_WINDOW_SYSTEM
-#if !HAVE_NS && !defined (WINDOWSNT)
+#if !HAVE_NS && !HAVE_NTGUI
 static
 #endif
 Lisp_Object
diff --git a/src/lisp.h b/src/lisp.h
index d8cf6b6960e..c4b36557eac 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4046,7 +4046,7 @@ extern void set_frame_param (struct frame *, Lisp_Object, Lisp_Object);
 extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);
 extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object);
 extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object);
-#if HAVE_NS || defined WINDOWSNT
+#if HAVE_NS || HAVE_NTGUI
 extern Lisp_Object get_frame_param (struct frame *, Lisp_Object);
 #endif
 extern void frames_discard_buffer (Lisp_Object);