aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-01-16 19:45:54 +0800
committerPo Lu2022-01-16 19:45:54 +0800
commit1220cf605b108751dae88e02aeadbef90bd83cc9 (patch)
treeef2ee288421afe8e5343a0a03e0f4f834ab9d7b5 /src
parent5476026119cfe35a4ff7a19f2a828152f56e0b2d (diff)
downloademacs-1220cf605b108751dae88e02aeadbef90bd83cc9.tar.gz
emacs-1220cf605b108751dae88e02aeadbef90bd83cc9.zip
Fix the xft build
* src/xsettings.h [!HAVE_PGTK]: Include dispextern.h and remove duplicate definition of Display_Info.
Diffstat (limited to 'src')
-rw-r--r--src/xsettings.h5
1 files changed, 2 insertions, 3 deletions
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/>. */
21#define XSETTINGS_H 21#define XSETTINGS_H
22 22
23#ifndef HAVE_PGTK 23#ifndef HAVE_PGTK
24#include "dispextern.h"
24#include <X11/Xlib.h> 25#include <X11/Xlib.h>
25#endif 26#endif
26 27
27struct x_display_info; 28struct x_display_info;
28struct pgtk_display_info; 29struct pgtk_display_info;
29 30
30#ifndef HAVE_PGTK 31#ifdef HAVE_PGTK
31typedef struct x_display_info Display_Info;
32#else
33typedef struct pgtk_display_info Display_Info; 32typedef struct pgtk_display_info Display_Info;
34#endif 33#endif
35 34