diff options
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/os.h | 2 | ||||
| -rw-r--r-- | xorg-server/include/privates.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/protocol-versions.h | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 7e0cdbd3e..59c057c44 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -526,7 +526,7 @@ extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X extern _X_EXPORT void VErrorF(const char *f, va_list args);
extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
-extern _X_EXPORT void Error(char *str);
+extern _X_EXPORT void Error(const char *str);
extern _X_EXPORT void LogPrintMarkers(void);
extern _X_EXPORT void xorg_backtrace(void);
diff --git a/xorg-server/include/privates.h b/xorg-server/include/privates.h index 6fb3184fe..e6c427fab 100644 --- a/xorg-server/include/privates.h +++ b/xorg-server/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/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h index 6ea4623da..441d76788 100644 --- a/xorg-server/include/protocol-versions.h +++ b/xorg-server/include/protocol-versions.h @@ -65,7 +65,7 @@ /* RandR */
#define SERVER_RANDR_MAJOR_VERSION 1
-#define SERVER_RANDR_MINOR_VERSION 3
+#define SERVER_RANDR_MINOR_VERSION 4
/* Record */
#define SERVER_RECORD_MAJOR_VERSION 1
@@ -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
|