Fix build with old XCB

* src/xfns.c (x_get_net_workarea):
* src/xterm.c (x_dnd_compute_toplevels, x_dnd_get_proxy_proto)
(x_dnd_get_wm_state_and_proto, handle_one_xevent): Do not
include xcb_aux.h.  Use XA_ constants instead of XCB_ATOM_ ones.

2 files changed, 19 insertions, 20 deletions

diff --git a/src/xfns.c b/src/xfns.c
index d713d3c378c..6d09527409c 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5723,13 +5723,13 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
     = xcb_get_property (dpyinfo->xcb_connection, 0,
                         (xcb_window_t) dpyinfo->root_window,
                         (xcb_atom_t) dpyinfo->Xatom_net_current_desktop,
-                        XCB_ATOM_CARDINAL, 0, 1);
+                        XA_CARDINAL, 0, 1);
 
   workarea_cookie
     = xcb_get_property (dpyinfo->xcb_connection, 0,
                         (xcb_window_t) dpyinfo->root_window,
                         (xcb_atom_t) dpyinfo->Xatom_net_workarea,
-                        XCB_ATOM_CARDINAL, 0, UINT32_MAX);
+                        XA_CARDINAL, 0, UINT32_MAX);
 
   reply = xcb_get_property_reply (dpyinfo->xcb_connection,
                                   current_desktop_cookie, &error);
@@ -5740,7 +5740,7 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
   else
     {
       if (xcb_get_property_value_length (reply) != 4
-          || reply->type != XCB_ATOM_CARDINAL || reply->format != 32)
+          || reply->type != XA_CARDINAL || reply->format != 32)
         rc = false;
       else
         current_workspace = *(uint32_t *) xcb_get_property_value (reply);
@@ -5755,7 +5755,7 @@ x_get_net_workarea (struct x_display_info *dpyinfo, XRectangle *rect)
     free (error), rc = false;
   else
     {
-      if (rc && reply->type == XCB_ATOM_CARDINAL && reply->format == 32
+      if (rc && reply->type == XA_CARDINAL && reply->format == 32
           && (xcb_get_property_value_length (reply) / sizeof (uint32_t)
               >= current_workspace + 4))
         {
diff --git a/src/xterm.c b/src/xterm.c
index d3842810c3f..ab31f0d93e6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -574,7 +574,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #ifdef USE_XCB
 #include <xcb/xproto.h>
 #include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 #endif
 
 /* If we have Xfixes extension, use it for pointer blanking.  */
@@ -3072,7 +3071,7 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
                                      0, 0);
       get_property_cookies[i]
         = xcb_get_property (dpyinfo->xcb_connection, 0, (xcb_window_t) toplevels[i],
-                            (xcb_atom_t) dpyinfo->Xatom_wm_state, XCB_ATOM_ANY,
+                            (xcb_atom_t) dpyinfo->Xatom_wm_state, 0,
                             0, 2);
       xm_property_cookies[i]
         = xcb_get_property (dpyinfo->xcb_connection, 0, (xcb_window_t) toplevels[i],
@@ -3083,7 +3082,7 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
         = xcb_get_property (dpyinfo->xcb_connection, 0,
                             (xcb_window_t) toplevels[i],
                             (xcb_atom_t) dpyinfo->Xatom_net_frame_extents,
-                            XCB_ATOM_CARDINAL, 0, 4);
+                            XA_CARDINAL, 0, 4);
       get_geometry_cookies[i]
         = xcb_get_geometry (dpyinfo->xcb_connection, (xcb_window_t) toplevels[i]);
 
@@ -3211,7 +3210,7 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
         {
           if (xcb_get_property_value_length (extent_property_reply) == 16
               && extent_property_reply->format == 32
-              && extent_property_reply->type == XCB_ATOM_CARDINAL)
+              && extent_property_reply->type == XA_CARDINAL)
             {
               fextents = xcb_get_property_value (extent_property_reply);
               frame_extents[0] = fextents[0];
@@ -3585,13 +3584,13 @@ x_dnd_get_proxy_proto (struct x_display_info *dpyinfo, Window wdesc,
     xdnd_proxy_cookie = xcb_get_property (dpyinfo->xcb_connection, 0,
                                           (xcb_window_t) wdesc,
                                           (xcb_atom_t) dpyinfo->Xatom_XdndProxy,
-                                          XCB_ATOM_WINDOW, 0, 1);
+                                          XA_WINDOW, 0, 1);
 
   if (proto_out)
     xdnd_proto_cookie = xcb_get_property (dpyinfo->xcb_connection, 0,
                                           (xcb_window_t) wdesc,
                                           (xcb_atom_t) dpyinfo->Xatom_XdndAware,
-                                          XCB_ATOM_ATOM, 0, 1);
+                                          XA_ATOM, 0, 1);
 
   if (proxy_out)
     {
@@ -3603,7 +3602,7 @@ x_dnd_get_proxy_proto (struct x_display_info *dpyinfo, Window wdesc,
       else
         {
           if (reply->format == 32
-              && reply->type == XCB_ATOM_WINDOW
+              && reply->type == XA_WINDOW
               && (xcb_get_property_value_length (reply) >= 4))
             *proxy_out = *(xcb_window_t *) xcb_get_property_value (reply);
 
@@ -3621,7 +3620,7 @@ x_dnd_get_proxy_proto (struct x_display_info *dpyinfo, Window wdesc,
       else
         {
           if (reply->format == 32
-              && reply->type == XCB_ATOM_ATOM
+              && reply->type == XA_ATOM
               && (xcb_get_property_value_length (reply) >= 4))
             *proto_out = (int) *(xcb_atom_t *) xcb_get_property_value (reply);
 
@@ -3805,15 +3804,15 @@ x_dnd_get_wm_state_and_proto (struct x_display_info *dpyinfo,
   wmstate_cookie = xcb_get_property (dpyinfo->xcb_connection, 0,
                                      (xcb_window_t) window,
                                      (xcb_atom_t) dpyinfo->Xatom_wm_state,
-                                     XCB_ATOM_ANY, 0, 2);
+                                     0, 0, 2);
   xdnd_proto_cookie = xcb_get_property (dpyinfo->xcb_connection, 0,
                                         (xcb_window_t) window,
                                         (xcb_atom_t) dpyinfo->Xatom_XdndAware,
-                                        XCB_ATOM_ATOM, 0, 1);
+                                        XA_ATOM, 0, 1);
   xdnd_proxy_cookie = xcb_get_property (dpyinfo->xcb_connection, 0,
                                         (xcb_window_t) window,
                                         (xcb_atom_t) dpyinfo->Xatom_XdndProxy,
-                                        XCB_ATOM_WINDOW, 0, 1);
+                                        XA_WINDOW, 0, 1);
   xm_style_cookie = xcb_get_property (dpyinfo->xcb_connection, 0,
                                       (xcb_window_t) window,
                                       (xcb_atom_t) dpyinfo->Xatom_MOTIF_DRAG_RECEIVER_INFO,
@@ -3860,7 +3859,7 @@ x_dnd_get_wm_state_and_proto (struct x_display_info *dpyinfo,
   else
     {
       if (reply->format == 32
-          && reply->type == XCB_ATOM_WINDOW
+          && reply->type == XA_WINDOW
           && (xcb_get_property_value_length (reply) >= 4))
         *proxy_out = *(xcb_window_t *) xcb_get_property_value (reply);
 
@@ -19239,7 +19238,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                 = xcb_get_property (dpyinfo->xcb_connection, 0,
                                     (xcb_window_t) FRAME_OUTER_WINDOW (f),
                                     (xcb_atom_t) dpyinfo->Xatom_net_wm_window_opacity,
-                                    XCB_ATOM_CARDINAL, 0, 1);
+                                    XA_CARDINAL, 0, 1);
               opacity_reply
                 = xcb_get_property_reply (dpyinfo->xcb_connection,
                                           opacity_cookie, &error);
@@ -19248,9 +19247,9 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                 free (error), rc = false;
               else
                 rc = (opacity_reply->format == 32
-                      && (opacity_reply->type == XCB_ATOM_CARDINAL
-                          || opacity_reply->type == XCB_ATOM_ATOM
-                          || opacity_reply->type == XCB_ATOM_WINDOW)
+                      && (opacity_reply->type == XA_CARDINAL
+                          || opacity_reply->type == XA_ATOM
+                          || opacity_reply->type == XA_WINDOW)
                       && (xcb_get_property_value_length (opacity_reply) >= 4));
 
               if (rc)