aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-21 09:33:19 +0100
committermarha <marha@users.sourceforge.net>2013-11-21 09:33:19 +0100
commit675f7aa9d3437c2abb133adbefdfddd1ea1ba219 (patch)
treeec62cd00c173da01d833724eee3b44fab9e4d02a
parent6e90a0e707aa6d28622f654078f25066bef4dc80 (diff)
downloadvcxsrv-675f7aa9d3437c2abb133adbefdfddd1ea1ba219.tar.gz
vcxsrv-675f7aa9d3437c2abb133adbefdfddd1ea1ba219.tar.bz2
vcxsrv-675f7aa9d3437c2abb133adbefdfddd1ea1ba219.zip
Synchronised xcbext.h and solved compiler warnings.
-rw-r--r--include/xcb/xcbext.h1
-rw-r--r--xorg-server/present/present_fake.c4
-rw-r--r--xorg-server/present/present_notify.c4
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 <xorg-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#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 <xorg-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
#endif
#include "present_priv.h"