diff options
| author | Ken Brown | 2013-12-09 15:46:07 -0500 |
|---|---|---|
| committer | Ken Brown | 2013-12-09 15:46:07 -0500 |
| commit | 336fe071e5d1587d39e002a87a562028ec9cbbe4 (patch) | |
| tree | 731e6af404e31aaccee6d3ab049ff2c385b86519 | |
| parent | 6aaca95125772b979d88fafc4c8d8b26c6ffcc5b (diff) | |
| download | emacs-336fe071e5d1587d39e002a87a562028ec9cbbe4.tar.gz emacs-336fe071e5d1587d39e002a87a562028ec9cbbe4.zip | |
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.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0970bf62b52..520261857df 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-12-09 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * frame.c (get_frame_param): Make extern if HAVE_NTGUI. | ||
| 4 | |||
| 5 | * lisp.h (get_frame_param): Adjust conditions for prototype | ||
| 6 | declaration. | ||
| 7 | |||
| 1 | 2013-12-09 Dmitry Antipov <dmantipov@yandex.ru> | 8 | 2013-12-09 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 9 | ||
| 3 | * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: | 10 | * 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. */) | |||
| 1929 | /* Return the value of frame parameter PROP in frame FRAME. */ | 1929 | /* Return the value of frame parameter PROP in frame FRAME. */ |
| 1930 | 1930 | ||
| 1931 | #ifdef HAVE_WINDOW_SYSTEM | 1931 | #ifdef HAVE_WINDOW_SYSTEM |
| 1932 | #if !HAVE_NS && !defined (WINDOWSNT) | 1932 | #if !HAVE_NS && !HAVE_NTGUI |
| 1933 | static | 1933 | static |
| 1934 | #endif | 1934 | #endif |
| 1935 | Lisp_Object | 1935 | 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); | |||
| 4046 | extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); | 4046 | extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); |
| 4047 | extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); | 4047 | extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); |
| 4048 | extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); | 4048 | extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); |
| 4049 | #if HAVE_NS || defined WINDOWSNT | 4049 | #if HAVE_NS || HAVE_NTGUI |
| 4050 | extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); | 4050 | extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); |
| 4051 | #endif | 4051 | #endif |
| 4052 | extern void frames_discard_buffer (Lisp_Object); | 4052 | extern void frames_discard_buffer (Lisp_Object); |