[Xcb-commit] 2 commits - xcb

[Josh Triplett]

 xcb/src/xcb.h      |   16 ++--------------
 xcb/src/xcb_auth.c |   12 ++----------
 xcb/src/xcb_in.c   |    2 +-
 3 files changed, 5 insertions(+), 25 deletions(-)

New commits:
diff-tree 0b0c30eeaa9306f7830ca18e1c116a7931f61e5f (from ba221c2565524b65ffb1ee664de18b7e4583cb1b)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Sep 23 13:33:27 2006 -0700

    We do not conflict with Xmd.h anymore; remove the include hack from xcb_auth.c

diff --git a/xcb/src/xcb_auth.c b/xcb/src/xcb_auth.c
index 42a3d86..4c9f7d6 100644
--- a/xcb/src/xcb_auth.c
+++ b/xcb/src/xcb_auth.c
@@ -34,21 +34,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-/* FIXME: for the moment Xdmcp.h must be included before xcb.h because
- * it includes Xmd.h, but config.h (normally included from xcbint.h
- * which must be included after xcb.h) must be included before Xdmcp.h.
- * Ow. */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "xcb.h"
+#include "xcbint.h"
 
 #ifdef HASXDMAUTH
 #include <X11/Xdmcp.h>
 #endif
 
-#include "xcb.h"
-#include "xcbint.h"
-
 enum auth_protos {
 #ifdef HASXDMAUTH
     AUTH_XA1,
diff-tree ba221c2565524b65ffb1ee664de18b7e4583cb1b (from 5e9f3ffd4cec3a66bbe1e6bfe930915a34b9364e)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Sep 23 13:31:13 2006 -0700

    Fix some mis-conversions by api_conv.pl, and remove the now-unused Xmd types

diff --git a/xcb/src/xcb.h b/xcb/src/xcb.h
index ed4d4b9..de3e444 100644
--- a/xcb/src/xcb.h
+++ b/xcb/src/xcb.h
@@ -35,18 +35,6 @@
 #include <stdint.h>
 #endif
 
-/* FIXME: these names conflict with those defined in Xmd.h. */
-#ifndef XMD_H
-typedef uint8_t  uint8_t;
-typedef uint8_t  uint8_t;
-typedef uint8_t  uint8_t;
-typedef uint16_t uint16_t;
-typedef uint32_t uint32_t;
-typedef int8_t   int8_t;
-typedef int16_t  int16_t;
-typedef int32_t  int32_t;
-#endif /* XMD_H */
-
 #include <sys/uio.h>
 #include <pthread.h>
 
@@ -60,7 +48,7 @@ extern "C" {
  */
 
 /**
- * @defgroup xcb__core_api_t XCB Core API
+ * @defgroup XCB_Core_API XCB Core API
  * @brief Core API of the XCB library.
  *
  * @{
@@ -157,7 +145,7 @@ typedef struct {
 /** XCB_NONE is the universal null resource or null atom parameter value for many core X requests */
 #define XCB_NONE 0L
 
-/** XCB_COPY_FROM_PARENT can be used for many CreateWindow parameters */
+/** XCB_COPY_FROM_PARENT can be used for many xcb_create_window parameters */
 #define XCB_COPY_FROM_PARENT 0L
 
 /** XCB_CURRENT_TIME can be used in most requests that take an xcb_timestamp_t */
diff --git a/xcb/src/xcb_in.c b/xcb/src/xcb_in.c
index 690f623..3498684 100644
--- a/xcb/src/xcb_in.c
+++ b/xcb/src/xcb_in.c
@@ -418,7 +418,7 @@ xcb_generic_event_t *xcb_poll_for_event(
         *error = -1;
     else
     {
-        fprintf(stderr, "xcb_poll_for_event_t: I/O error occured, but no handler provided.\n");
+        fprintf(stderr, "xcb_poll_for_event: I/O error occured, but no handler provided.\n");
         abort();
     }
     return 0;