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 0970bf62b52d1597d49b2f1659b898216a1307ec..520261857df9e695e46076f35df62672fc66ad19 100644 (file)
--- 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 e13c3768e125ac29463b17ee32392c783edac75e..43e549235dff61d7922925f190ef2bfb3999b4ed 100644 (file)
--- 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 d8cf6b6960efca9639d99abd55199854288d62aa..c4b36557eac81845d47a32a1952a66bee7eb3de2 100644 (file)
--- 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);