diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-01-16 19:45:54 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-01-16 19:45:54 +0800 |
| commit | 1220cf605b108751dae88e02aeadbef90bd83cc9 (patch) | |
| tree | ef2ee288421afe8e5343a0a03e0f4f834ab9d7b5 | |
| parent | 5476026119cfe35a4ff7a19f2a828152f56e0b2d (diff) | |
| download | emacs-1220cf605b108751dae88e02aeadbef90bd83cc9.tar.gz | |
Fix the xft build
* src/xsettings.h [!HAVE_PGTK]: Include dispextern.h and remove
duplicate definition of Display_Info.
| -rw-r--r-- | src/xsettings.h | 5 |
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/>. */ #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 |