From: Philipp Stephani <phst@google.com>
Date: Sun, 13 Oct 2019 15:24:10 +0000 (+0200)
Subject: Avoid compiler warnings on macOS.
X-Git-Tag: emacs-27.0.90~1103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07cbc3bb1cef9e935d64e358fbaa162e0870ea80;p=emacs.git

Avoid compiler warnings on macOS.

* src/xdisp.c (note_tab_bar_highlight): Define variables 'dpyinfo' and
'mouse_down_p' only if needed.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 893ce9269c1..252e3ed7c18 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13334,7 +13334,9 @@ note_tab_bar_highlight (struct frame *f, int x, int y)
 {
   Lisp_Object window = f->tab_bar_window;
   struct window *w = XWINDOW (window);
+#ifndef HAVE_NS
   Display_Info *dpyinfo = FRAME_DISPLAY_INFO (f);
+#endif
   Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
   int hpos, vpos;
   struct glyph *glyph;
@@ -13344,7 +13346,9 @@ note_tab_bar_highlight (struct frame *f, int x, int y)
   int prop_idx;
   bool close_p;
   enum draw_glyphs_face draw = DRAW_IMAGE_RAISED;
+#ifndef HAVE_NS
   bool mouse_down_p;
+#endif
   int rc;
 
   /* Function note_mouse_highlight is called with negative X/Y