master 1220cf605b: Fix the xft build

[Po Lu]

branch: master
commit 1220cf605b108751dae88e02aeadbef90bd83cc9
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix the xft build
    
    * src/xsettings.h [!HAVE_PGTK]: Include dispextern.h and remove
    duplicate definition of Display_Info.
---
 src/xsettings.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/xsettings.h b/src/xsettings.h
index 266526df10..ccaa36489d 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