From 675f7aa9d3437c2abb133adbefdfddd1ea1ba219 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 21 Nov 2013 09:33:19 +0100 Subject: Synchronised xcbext.h and solved compiler warnings. --- include/xcb/xcbext.h | 1 - xorg-server/present/present_fake.c | 4 ++-- xorg-server/present/present_notify.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/xcb/xcbext.h b/include/xcb/xcbext.h index 1eb1be77f..20ec1c37a 100644 --- a/include/xcb/xcbext.h +++ b/include/xcb/xcbext.h @@ -69,7 +69,6 @@ void xcb_send_fd(xcb_connection_t *c, int fd); * callback which XCB can call when it wants the write side of the * socket back to make a request. This callback synchronizes with the * external socket owner and flushes any output queues if appropriate. - * The callback might be called from different threads at the same time. * If you are sending requests which won't cause a reply, please note the * comment for xcb_writev which explains some sequence number wrap issues. * */ diff --git a/xorg-server/present/present_fake.c b/xorg-server/present/present_fake.c index e550e98f8..7926f7a4c 100644 --- a/xorg-server/present/present_fake.c +++ b/xorg-server/present/present_fake.c @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "present_priv.h" diff --git a/xorg-server/present/present_notify.c b/xorg-server/present/present_notify.c index e272e08dc..fe8a57117 100644 --- a/xorg-server/present/present_notify.c +++ b/xorg-server/present/present_notify.c @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include "present_priv.h" -- cgit v1.2.3