diff options
| author | Alan Mackenzie | 2022-01-22 11:02:50 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2022-01-22 11:02:50 +0000 |
| commit | 14d64a8adcc866deecd758b898e8ef2d836b354a (patch) | |
| tree | 83cff9669e266f8e283ccb8cd7518e909240f1e1 /src/xsettings.h | |
| parent | bdd9b5b8a0d37dd09ee530c1dab3a44bee09e0f8 (diff) | |
| parent | ebe334cdc234de2897263aed4c05ac7088c11857 (diff) | |
| download | emacs-scratch/correct-warning-pos.tar.gz emacs-scratch/correct-warning-pos.zip | |
Merge branch 'master' into scratch/correct-warning-posscratch/correct-warning-pos
Diffstat (limited to 'src/xsettings.h')
| -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/>. */ | |||
| 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 | ||
| 27 | struct x_display_info; | 28 | struct x_display_info; |
| 28 | struct pgtk_display_info; | 29 | struct pgtk_display_info; |
| 29 | 30 | ||
| 30 | #ifndef HAVE_PGTK | 31 | #ifdef HAVE_PGTK |
| 31 | typedef struct x_display_info Display_Info; | ||
| 32 | #else | ||
| 33 | typedef struct pgtk_display_info Display_Info; | 32 | typedef struct pgtk_display_info Display_Info; |
| 34 | #endif | 33 | #endif |
| 35 | 34 | ||