frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "xvmc: move over protocol version defines into xvmc.c" 

This reverts commit a33639f975

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2034>
This commit is contained in:
Alan Coopersmith 2025-06-22 09:17:25 -07:00
parent 8006778970
commit bfd15d6e5a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/xvmc.c
View File

@ -20,6 +20,7 @@
#include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvproto.h>
#include <X11/extensions/XvMCproto.h> #include <X11/extensions/XvMCproto.h>
#include "xvmcext.h" #include "xvmcext.h"
#include "protocol-versions.h"
#ifdef HAS_XVMCSHM #ifdef HAS_XVMCSHM
#include <sys/ipc.h> #include <sys/ipc.h>
@ -27,9 +28,6 @@
#include <sys/shm.h> #include <sys/shm.h>
#endif /* HAS_XVMCSHM */ #endif /* HAS_XVMCSHM */
#define SERVER_XVMC_MAJOR_VERSION 1
#define SERVER_XVMC_MINOR_VERSION 1
#define DR_CLIENT_DRIVER_NAME_SIZE 48 #define DR_CLIENT_DRIVER_NAME_SIZE 48
#define DR_BUSID_SIZE 48 #define DR_BUSID_SIZE 48

4
include/protocol-versions.h
View File

@ -157,4 +157,8 @@
#define SERVER_XRES_MAJOR_VERSION 1 #define SERVER_XRES_MAJOR_VERSION 1
#define SERVER_XRES_MINOR_VERSION 2 #define SERVER_XRES_MINOR_VERSION 2
/* XvMC */
#define SERVER_XVMC_MAJOR_VERSION 1
#define SERVER_XVMC_MINOR_VERSION 1
#endif #endif