hw/xwin: Consistently use BOOL type from Xmd.h

This avoids including Xdefs.h, which means we avoid all the issues with
_XSERVER64 effecting how types are defined by that.

7 files changed, 17 insertions, 17 deletions

diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
index 8d3bcb447..4e1b26d13 100644
--- a/hw/xwin/winauth.c
+++ b/hw/xwin/winauth.c
@@ -77,7 +77,7 @@ GenerateAuthorization(unsigned name_length,
  * Generate authorization cookie for internal server clients
  */
 
-Bool
+BOOL
 winGenerateAuthorization(void)
 {
 #ifdef XCSECURITY
diff --git a/hw/xwin/winauth.h b/hw/xwin/winauth.h
index 68d3ac0cb..97cfe52a1 100644
--- a/hw/xwin/winauth.h
+++ b/hw/xwin/winauth.h
@@ -20,7 +20,7 @@
  */
 
 #include <xcb/xcb.h>
-#include <X11/Xdefs.h> // for Bool
+#include <X11/Xmd.h> // for BOOL
 
-Bool winGenerateAuthorization(void);
+BOOL winGenerateAuthorization(void);
 xcb_auth_info_t * winGetXcbAuthInfo(void);
diff --git a/hw/xwin/winclipboard/internal.h b/hw/xwin/winclipboard/internal.h
index bb862a258..368fa7057 100644
--- a/hw/xwin/winclipboard/internal.h
+++ b/hw/xwin/winclipboard/internal.h
@@ -33,7 +33,7 @@
 
 #include <xcb/xproto.h>
 #include <X11/Xfuncproto.h> // for _X_ATTRIBUTE_PRINTF
-#include <X11/Xdefs.h> // for Bool type
+#include <X11/Xmd.h> // for BOOL
 
 /* Windows headers */
 #include <X11/Xwindows.h>
@@ -82,7 +82,7 @@ typedef struct
  * winclipboardwndproc.c
  */
 
-Bool winClipboardFlushWindowsMessageQueue(HWND hwnd);
+BOOL winClipboardFlushWindowsMessageQueue(HWND hwnd);
 
 LRESULT CALLBACK
 winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
diff --git a/hw/xwin/winclipboard/thread.c b/hw/xwin/winclipboard/thread.c
index 7e47f7e08..0e60c1b24 100644
--- a/hw/xwin/winclipboard/thread.c
+++ b/hw/xwin/winclipboard/thread.c
@@ -103,7 +103,7 @@ intern_atom(xcb_connection_t *conn, const char *atomName)
  * returns TRUE if shutdown was signalled to loop, FALSE if some error occurred
  */
 
-Bool
+BOOL
 winClipboardProc(char *szDisplay, xcb_auth_info_t *auth_info)
 {
     ClipboardAtoms atoms;
@@ -120,7 +120,7 @@ winClipboardProc(char *szDisplay, xcb_auth_info_t *auth_info)
     xcb_connection_t *conn;
     xcb_window_t iWindow = XCB_NONE;
     int iSelectError;
-    Bool fShutdown = FALSE;
+    BOOL fShutdown = FALSE;
     ClipboardConversionData data;
     int screen;
 
diff --git a/hw/xwin/winclipboard/winclipboard.h b/hw/xwin/winclipboard/winclipboard.h
index 5b25e6e42..243aa24dc 100644
--- a/hw/xwin/winclipboard/winclipboard.h
+++ b/hw/xwin/winclipboard/winclipboard.h
@@ -27,15 +27,15 @@
 #ifndef WINCLIPBOARD_H
 #define WINCLIPBOARD_H
 
-#include <X11/Xdefs.h> // for Bool type
 #include <xcb/xcb.h>
+#include <X11/Xmd.h> // for BOOL type
 
-Bool winClipboardProc(char *szDisplay, xcb_auth_info_t *auth_info);
+BOOL winClipboardProc(char *szDisplay, xcb_auth_info_t *auth_info);
 
 void winFixClipboardChain(void);
 
 void winClipboardWindowDestroy(void);
 
-extern Bool fPrimarySelection;
+extern BOOL fPrimarySelection;
 
 #endif
diff --git a/hw/xwin/winclipboard/wndproc.c b/hw/xwin/winclipboard/wndproc.c
index ecbeabd75..10824a3ae 100644
--- a/hw/xwin/winclipboard/wndproc.c
+++ b/hw/xwin/winclipboard/wndproc.c
@@ -131,7 +131,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     static xcb_connection_t *conn;
     static xcb_window_t iWindow;
     static ClipboardAtoms *atoms;
-    static Bool fRunning;
+    static BOOL fRunning;
 
     /* Branch on message type */
     switch (message) {
@@ -310,7 +310,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case WM_RENDERFORMAT:
     {
         int iReturn;
-        Bool pasted = FALSE;
+        BOOL pasted = FALSE;
         xcb_atom_t selection;
         ClipboardConversionData data;
         int best_target = 0;
@@ -440,7 +440,7 @@ winClipboardWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
  * Process any pending Windows messages
  */
 
-Bool
+BOOL
 winClipboardFlushWindowsMessageQueue(HWND hwnd)
 {
     MSG msg;
diff --git a/hw/xwin/winclipboard/xevents.c b/hw/xwin/winclipboard/xevents.c
index 8e8f34095..cac17153f 100644
--- a/hw/xwin/winclipboard/xevents.c
+++ b/hw/xwin/winclipboard/xevents.c
@@ -59,7 +59,7 @@
  */
 
 extern int xfixes_event_base;
-Bool fPrimarySelection = TRUE;
+BOOL fPrimarySelection = TRUE;
 
 /*
  * Local variables
@@ -198,7 +198,7 @@ winClipboardSelectionNotifyData(HWND hwnd, xcb_window_t iWindow, xcb_connection_
     xcb_atom_t xtpText_encoding;
     int xtpText_nitems;
 
-    Bool fSetClipboardData = TRUE;
+    BOOL fSetClipboardData = TRUE;
     char *pszReturnData = NULL;
     UINT codepage;
     wchar_t *pwszUnicodeStr = NULL;
@@ -403,8 +403,8 @@ winClipboardFlushXEvents(HWND hwnd,
         const char *pszGlobalData = NULL;
         HGLOBAL hGlobal = NULL;
         char *pszConvertData = NULL;
-        Bool fAbort = FALSE;
-        Bool fCloseClipboard = FALSE;
+        BOOL fAbort = FALSE;
+        BOOL fCloseClipboard = FALSE;
 
         /* Branch on the event type */
         switch (event->response_type & ~0x80) {