[Emacs-diffs] trunk r115442: Fix declaration of get_frame_param for cygw32 build.

[Ken Brown]

------------------------------------------------------------
revno: 115442
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-09 15:46:07 -0500
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-09 16:30:52 +0000
+++ b/src/ChangeLog     2013-12-09 20:46:07 +0000
@@ -1,3 +1,10 @@
+2013-12-09  Ken Brown  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-12-08 09:56:02 +0000
+++ b/src/frame.c       2013-12-09 20:46:07 +0000
@@ -1929,7 +1929,7 @@
 /* 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

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-12-04 22:10:46 +0000
+++ b/src/lisp.h        2013-12-09 20:46:07 +0000
@@ -4046,7 +4046,7 @@
 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);