summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-12-06 19:51:06 -0800
committerKeith Packard <keithp@keithp.com>2010-12-06 19:51:06 -0800
commitf5b8bd620f91214c0b87e9b04d57015655792352 (patch)
tree25a8ad5fbc4d4451a0e34025b656e23e16fdd8db /include
parent01e9fa7da389fc7ab834b4234b8484514144b7f4 (diff)
parent8127c83c81bf64369a8ba2999088226d14e0b128 (diff)
Merge remote branch 'jajones/for-keith'
Diffstat (limited to 'include')
-rw-r--r--include/privates.h1
-rw-r--r--include/protocol-versions.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/include/privates.h b/include/privates.h
index 9fb6ae84e..7ef2cb732 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -51,6 +51,7 @@ typedef enum {
PRIVATE_GLYPH,
PRIVATE_GLYPHSET,
PRIVATE_PICTURE,
+ PRIVATE_SYNC_FENCE,
/* last private type */
PRIVATE_LAST,
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index c67446548..1d33bddcf 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -95,6 +95,10 @@
#define SERVER_SHM_MAJOR_VERSION 1
#define SERVER_SHM_MINOR_VERSION 1
+/* Sync */
+#define SERVER_SYNC_MAJOR_VERSION 3
+#define SERVER_SYNC_MINOR_VERSION 1
+
/* Windows WM */
#define SERVER_WINDOWSWM_MAJOR_VERSION 1
#define SERVER_WINDOWSWM_MINOR_VERSION 0