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

xv: unexport VALIDATE_XV_PORT and _XvBadPort macros 

These are only used inside xv extension code, so no need to keep
them exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-30 14:17:29 +02:00 committed by Marge Bot
parent 9bb6d8b169
commit d53b5550c1
5 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/xvdisp.c
View File

@ -33,6 +33,7 @@ SOFTWARE.
#include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvproto.h>
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "Xext/xvdix_priv.h"
#include "misc.h" #include "misc.h"
#include "scrnintstr.h" #include "scrnintstr.h"
@ -42,7 +43,6 @@ SOFTWARE.
#include "dixstruct.h" #include "dixstruct.h"
#include "resource.h" #include "resource.h"
#include "opaque.h" #include "opaque.h"
#include "xvdix.h"
#ifdef MITSHM #ifdef MITSHM
#include <X11/extensions/shmproto.h> #include <X11/extensions/shmproto.h>
#include "shmint.h" #include "shmint.h"

12
Xext/xvdix.h
View File

@ -178,14 +178,6 @@ typedef struct _XvPortRec {
DevUnion devPriv; DevUnion devPriv;
} XvPortRec, *XvPortPtr; } XvPortRec, *XvPortPtr;
#define VALIDATE_XV_PORT(portID, pPort, mode)\
{\
int rc = dixLookupResourceByType((void **)&(pPort), portID,\
XvRTPort, client, mode);\
if (rc != Success)\
return rc;\
}
typedef struct { typedef struct {
int version, revision; int version, revision;
int nAdaptors; int nAdaptors;
@ -195,10 +187,6 @@ typedef struct {
CloseScreenProcPtr CloseScreen; CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr; } XvScreenRec, *XvScreenPtr;
/* Errors */
#define _XvBadPort (XvBadPort+XvErrorBase)
extern _X_EXPORT int ProcXvDispatch(ClientPtr); extern _X_EXPORT int ProcXvDispatch(ClientPtr);
extern _X_EXPORT int SProcXvDispatch(ClientPtr); extern _X_EXPORT int SProcXvDispatch(ClientPtr);

23
Xext/xvdix_priv.h Normal file
View File

@ -0,0 +1,23 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XORG_XVDIX_PRIV_H
#include <X11/Xdefs.h>
#include "Xext/xvdix.h"
#define VALIDATE_XV_PORT(portID, pPort, mode)\
{\
int rc = dixLookupResourceByType((void **)&(pPort), portID,\
XvRTPort, client, mode);\
if (rc != Success)\
return rc;\
}
/* Errors */
#define _XvBadPort (XvBadPort+XvErrorBase)
#endif /* _XORG_XVDIX_PRIV_H */

10
Xext/xvmain.c
View File

@ -78,9 +78,13 @@ SOFTWARE.
#endif #endif
#include <string.h> #include <string.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvproto.h>
#include "Xext/xvdix_priv.h"
#include "misc.h" #include "misc.h"
#include "os.h" #include "os.h"
#include "scrnintstr.h" #include "scrnintstr.h"
@ -94,10 +98,6 @@ SOFTWARE.
#include "opaque.h" #include "opaque.h"
#include "input.h" #include "input.h"
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvproto.h>
#include "xvdix.h"
#ifdef PANORAMIX #ifdef PANORAMIX
#include "panoramiX.h" #include "panoramiX.h"
#include "panoramiXsrv.h" #include "panoramiXsrv.h"

5
Xext/xvmc.c
View File

@ -4,9 +4,11 @@
#endif #endif
#include <string.h> #include <string.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "Xext/xvdix_priv.h"
#include "misc.h" #include "misc.h"
#include "os.h" #include "os.h"
#include "dixstruct.h" #include "dixstruct.h"
@ -16,7 +18,6 @@
#include "extinit_priv.h" #include "extinit_priv.h"
#include "servermd.h" #include "servermd.h"
#include <X11/Xfuncproto.h> #include <X11/Xfuncproto.h>
#include "xvdix.h"
#include <X11/extensions/XvMC.h> #include <X11/extensions/XvMC.h>
#include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvproto.h>
#include <X11/extensions/XvMCproto.h> #include <X11/extensions/XvMCproto.h>