aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-10-02 21:35:51 +0300
committerEli Zaretskii2017-10-02 21:35:51 +0300
commitd09ac15005f36b2788406da6c573487fc323129d (patch)
treed9248b718c69714cfb68a48d9ad9314bbc3f81dd /src
parentb69bcf34523551a93635bef90f0eb1d109c1076c (diff)
downloademacs-d09ac15005f36b2788406da6c573487fc323129d.tar.gz
emacs-d09ac15005f36b2788406da6c573487fc323129d.zip
Fix the --without-x build
* src/frame.c (Ficonify_frame) [HAVE_WINDOW_SYSTEM]: Use frame_parent only in GUI builds to avoid compilation errors in --without-x builds. (Bug#28611)
Diffstat (limited to 'src')
-rw-r--r--src/frame.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c
index 1aff3a007ac..ab801eec9c7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2542,6 +2542,7 @@ for how to proceed. */)
2542 (Lisp_Object frame) 2542 (Lisp_Object frame)
2543{ 2543{
2544 struct frame *f = decode_live_frame (frame); 2544 struct frame *f = decode_live_frame (frame);
2545#ifdef HAVE_WINDOW_SYSTEM
2545 Lisp_Object parent = f->parent_frame; 2546 Lisp_Object parent = f->parent_frame;
2546 2547
2547 if (!NILP (parent)) 2548 if (!NILP (parent))
@@ -2562,6 +2563,7 @@ for how to proceed. */)
2562 return Qnil; 2563 return Qnil;
2563 } 2564 }
2564 } 2565 }
2566#endif /* HAVE_WINDOW_SYSTEM */
2565 2567
2566 /* Don't allow minibuf_window to remain on an iconified frame. */ 2568 /* Don't allow minibuf_window to remain on an iconified frame. */
2567 check_minibuf_window (frame, EQ (minibuf_window, selected_window)); 2569 check_minibuf_window (frame, EQ (minibuf_window, selected_window));