diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-04-26 02:26:44 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2019-06-01 18:36:44 +0100 |
| commit | 754446987d62bab4e82900e85d105aa730a4e415 (patch) | |
| tree | 5c3fc0299d018b00396bbf8f3b770fb2babba9c2 | |
| parent | a475b25de8da4d2f82be29ed4728873f827524c9 (diff) | |
hw/xwin: Fix lingering uses of libX11 types and values
| -rw-r--r-- | hw/xwin/winmultiwindowicons.c | 3 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowicons.h | 2 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowwm.c | 2 | ||||
| -rw-r--r-- | hw/xwin/winwindow.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 5124b88ff..94e32a707 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -33,7 +33,6 @@ #endif #include <X11/Xwindows.h> -#include <X11/Xlib.h> #include "winresource.h" #include "winprefs.h" @@ -51,7 +50,7 @@ extern HINSTANCE g_hInstance; */ void -winUpdateIcon(HWND hWnd, xcb_connection_t *conn, Window id, HICON hIconNew) +winUpdateIcon(HWND hWnd, xcb_connection_t *conn, xcb_window_t id, HICON hIconNew) { HICON hIcon, hIconSmall = NULL, hIconOld; diff --git a/hw/xwin/winmultiwindowicons.h b/hw/xwin/winmultiwindowicons.h index 87ba8d1cf..8b077ab80 100644 --- a/hw/xwin/winmultiwindowicons.h +++ b/hw/xwin/winmultiwindowicons.h @@ -30,7 +30,7 @@ #include <xcb/xcb.h> void - winUpdateIcon(HWND hWnd, xcb_connection_t *conn, Window id, HICON hIconNew); + winUpdateIcon(HWND hWnd, xcb_connection_t *conn, xcb_window_t id, HICON hIconNew); void winInitGlobalIcons(void); diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 4a28ccb8e..b3cc4bbff 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -1485,7 +1485,7 @@ winMultiWindowXMsgProc(void *pArg) if ((reply->root == reply_qt->parent) && !notify->override_redirect) { xcb_reparent_notify_event_t event_send; - event_send.response_type = ReparentNotify; + event_send.response_type = XCB_REPARENT_NOTIFY; event_send.event = notify->window; event_send.window = notify->window; event_send.parent = reply_qt->parent; diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index e73098838..10a10205d 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -32,6 +32,8 @@ #if !defined(_WINWINDOW_H_) #define _WINWINDOW_H_ +#include <pthread.h> + #ifndef NO #define NO 0 #endif |