Move xcb_generate_id from xcbext.h to xcb.h

Since extensions no longer provide type-specific XID-generation functions,
xcb_generate_id now forms part of the xcb client API, rather than the
extension API; move it from xcbext.h to xcb.h accordingly.

diff --git a/src/xcb.h b/src/xcb.h
index 4b5b349..eaab47f 100644 (file)
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -408,6 +408,11 @@ xcb_connection_t *xcb_connect(const char *displayname, int *screenp);
 xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *display, xcb_auth_info_t *auth, int *screen);
 
 
+/* xcb_xid.c */
+
+uint32_t xcb_generate_id(xcb_connection_t *c);
+
+
 /**
  * @}
  */

diff --git a/src/xcbext.h b/src/xcbext.h
index 4824660..01dd590 100644 (file)
--- a/src/xcbext.h
+++ b/src/xcbext.h
@@ -66,11 +66,6 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_
 int xcb_poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, xcb_generic_error_t **error);
 
 
-/* xcb_xid.c */
-
-uint32_t xcb_generate_id(xcb_connection_t *c);
-
-
 /* xcb_util.c */
 
 int xcb_popcount(uint32_t mask);