diff options
| author | Po Lu | 2022-08-08 11:59:08 +0800 |
|---|---|---|
| committer | Po Lu | 2022-08-08 11:59:08 +0800 |
| commit | 9b661ff1a8e0fc3fc809a42a187356d6cb5ad2c9 (patch) | |
| tree | 8b0be52297a4e5c419c3e95a988046880fb3e272 /src | |
| parent | 16b8948d79e27a37d223eb171c21e6b78d8b5a7a (diff) | |
| download | emacs-9b661ff1a8e0fc3fc809a42a187356d6cb5ad2c9.tar.gz emacs-9b661ff1a8e0fc3fc809a42a187356d6cb5ad2c9.zip | |
Fix warnings outside XI2 builds
* src/xterm.c (x_query_pointer): Juggle some definitions around.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index c1f74f68666..23a35aa1618 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -13091,10 +13091,10 @@ x_query_pointer (Display *dpy, Window w, Window *root_return, | |||
| 13091 | int *root_y_return, int *win_x_return, | 13091 | int *root_y_return, int *win_x_return, |
| 13092 | int *win_y_return, unsigned int *mask_return) | 13092 | int *win_y_return, unsigned int *mask_return) |
| 13093 | { | 13093 | { |
| 13094 | struct x_display_info *dpyinfo; | ||
| 13095 | Bool rc; | 13094 | Bool rc; |
| 13096 | bool had_errors; | ||
| 13097 | #ifdef HAVE_XINPUT2 | 13095 | #ifdef HAVE_XINPUT2 |
| 13096 | struct x_display_info *dpyinfo; | ||
| 13097 | bool had_errors; | ||
| 13098 | XIModifierState modifiers; | 13098 | XIModifierState modifiers; |
| 13099 | XIButtonState buttons; | 13099 | XIButtonState buttons; |
| 13100 | XIGroupState group; /* Unused. */ | 13100 | XIGroupState group; /* Unused. */ |
| @@ -13102,8 +13102,8 @@ x_query_pointer (Display *dpy, Window w, Window *root_return, | |||
| 13102 | unsigned int state; | 13102 | unsigned int state; |
| 13103 | #endif | 13103 | #endif |
| 13104 | 13104 | ||
| 13105 | dpyinfo = x_display_info_for_display (dpy); | ||
| 13106 | #ifdef HAVE_XINPUT2 | 13105 | #ifdef HAVE_XINPUT2 |
| 13106 | dpyinfo = x_display_info_for_display (dpy); | ||
| 13107 | if (dpyinfo && dpyinfo->client_pointer_device != -1) | 13107 | if (dpyinfo && dpyinfo->client_pointer_device != -1) |
| 13108 | { | 13108 | { |
| 13109 | /* Catch errors caused by the device going away. This is not | 13109 | /* Catch errors caused by the device going away. This is not |