diff options
| author | Andreas Schwab | 2012-07-07 23:39:23 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-07-07 23:39:23 +0200 |
| commit | 298819b917a8ecd5a8f2683f6be22234af0d244d (patch) | |
| tree | f1034d06e4fe37d9250463490c478ca9d01da2d8 /src | |
| parent | b676b881b26958bea01278cbcb7fee67fd79532e (diff) | |
| download | emacs-298819b917a8ecd5a8f2683f6be22234af0d244d.tar.gz emacs-298819b917a8ecd5a8f2683f6be22234af0d244d.zip | |
* frame.c (get_frame_param): Define only if HAVE_WINDOW_SYSTEM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/frame.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4ae2622d87d..d481d1f1c10 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-07-07 Andreas Schwab <schwab@linux-m68k.org> | 1 | 2012-07-07 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 2 | ||
| 3 | * frame.c (get_frame_param): Define only if HAVE_WINDOW_SYSTEM. | ||
| 4 | |||
| 3 | * lisp.h: Remove empty conditional. | 5 | * lisp.h: Remove empty conditional. |
| 4 | 6 | ||
| 5 | 2012-07-07 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2012-07-07 Paul Eggert <eggert@cs.ucla.edu> |
diff --git a/src/frame.c b/src/frame.c index c0293f6c869..4902811ecff 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1932,6 +1932,7 @@ See `redirect-frame-focus'. */) | |||
| 1932 | 1932 | ||
| 1933 | /* Return the value of frame parameter PROP in frame FRAME. */ | 1933 | /* Return the value of frame parameter PROP in frame FRAME. */ |
| 1934 | 1934 | ||
| 1935 | #ifdef HAVE_WINDOW_SYSTEM | ||
| 1935 | #if !HAVE_NS | 1936 | #if !HAVE_NS |
| 1936 | static | 1937 | static |
| 1937 | #endif | 1938 | #endif |
| @@ -1945,6 +1946,7 @@ get_frame_param (register struct frame *frame, Lisp_Object prop) | |||
| 1945 | return tem; | 1946 | return tem; |
| 1946 | return Fcdr (tem); | 1947 | return Fcdr (tem); |
| 1947 | } | 1948 | } |
| 1949 | #endif | ||
| 1948 | 1950 | ||
| 1949 | /* Return the buffer-predicate of the selected frame. */ | 1951 | /* Return the buffer-predicate of the selected frame. */ |
| 1950 | 1952 | ||