From: Po Lu <luangruo@yahoo.com>
Date: Sun, 16 Jan 2022 11:45:54 +0000 (+0800)
Subject: Fix the xft build
X-Git-Tag: emacs-29.0.90~3010
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1220cf605b108751dae88e02aeadbef90bd83cc9;p=emacs.git

Fix the xft build

* src/xsettings.h [!HAVE_PGTK]: Include dispextern.h and remove
duplicate definition of Display_Info.
---

diff --git a/src/xsettings.h b/src/xsettings.h
index 266526df101..ccaa36489d0 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -21,15 +21,14 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #define XSETTINGS_H
 
 #ifndef HAVE_PGTK
+#include "dispextern.h"
 #include <X11/Xlib.h>
 #endif
 
 struct x_display_info;
 struct pgtk_display_info;
 
-#ifndef HAVE_PGTK
-typedef struct x_display_info Display_Info;
-#else
+#ifdef HAVE_PGTK
 typedef struct pgtk_display_info Display_Info;
 #endif