diff options
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | xorg-server/include/os.h | 3 | ||||
| -rw-r--r-- | xorg-server/include/protocol-versions.h | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index d4fbe99fa..306610000 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -466,4 +466,7 @@ /* Wrap SIGBUS to catch MIT-SHM faults */ #undef BUSFAULT +/* Directory for shared memory temp files */ +#undef SHMDIR + #endif /* _DIX_CONFIG_H_ */ diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index 4689e573d..218b7f639 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -702,4 +702,7 @@ xorg_backtrace(void); #define snprintf _snprintf #endif +extern _X_EXPORT int +os_move_fd(int fd); + #endif /* OS_H */ diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h index 95df8ce1a..fc428c8cf 100644 --- a/xorg-server/include/protocol-versions.h +++ b/xorg-server/include/protocol-versions.h @@ -46,6 +46,10 @@ #define SERVER_DAMAGE_MAJOR_VERSION 1 #define SERVER_DAMAGE_MINOR_VERSION 1 +/* DRI3 */ +#define SERVER_DRI3_MAJOR_VERSION 1 +#define SERVER_DRI3_MINOR_VERSION 0 + /* DMX */ #define SERVER_DMX_MAJOR_VERSION 2 #define SERVER_DMX_MINOR_VERSION 2 @@ -63,6 +67,10 @@ #define SERVER_PANORAMIX_MAJOR_VERSION 1 #define SERVER_PANORAMIX_MINOR_VERSION 1 +/* Present */ +#define SERVER_PRESENT_MAJOR_VERSION 1 +#define SERVER_PRESENT_MINOR_VERSION 0 + /* RandR */ #define SERVER_RANDR_MAJOR_VERSION 1 #define SERVER_RANDR_MINOR_VERSION 4 |