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

(!1675) Revert "xv: unexport XvScreenRec and XvScreenPtr" 

This reverts commit 58a2fb8b6f.

Needed by xf86-video-intel driver. Didn't get noticed, because we don't
have this driver in our CI yet.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-06 21:32:47 +02:00
parent 7d6464e029
commit 00363c8840
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/xvdix.h
View File

@ -169,6 +169,15 @@ typedef struct _XvPortRec {
DevUnion devPriv; DevUnion devPriv;
} XvPortRec, *XvPortPtr; } XvPortRec, *XvPortPtr;
typedef struct {
int version, revision;
int nAdaptors;
XvAdaptorPtr pAdaptors;
DestroyWindowProcPtr DestroyWindow;
DestroyPixmapProcPtr DestroyPixmap;
CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr;
extern _X_EXPORT int XvScreenInit(ScreenPtr); extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void); extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void); extern _X_EXPORT unsigned long XvGetRTPort(void);

9
Xext/xvdix_priv.h
View File

@ -22,15 +22,6 @@
#define _XvBadPort (XvBadPort+XvErrorBase) #define _XvBadPort (XvBadPort+XvErrorBase)
typedef struct {
int version, revision;
int nAdaptors;
XvAdaptorPtr pAdaptors;
DestroyWindowProcPtr DestroyWindow;
DestroyPixmapProcPtr DestroyPixmap;
CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr;
typedef struct _XvPortNotifyRec { typedef struct _XvPortNotifyRec {
struct _XvPortNotifyRec *next; struct _XvPortNotifyRec *next;
ClientPtr client; ClientPtr client;

10
hw/xfree86/common/xf86xvmc.c
View File

@ -25,21 +25,21 @@
* the sale, use or other dealings in this Software without prior written * the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s). * authorization from the copyright holder(s) and author(s).
*/ */
#ifdef HAVE_XORG_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#include <X11/X.h>
#include <X11/Xproto.h>
#include "Xext/xvdix_priv.h"
#include "misc.h" #include "misc.h"
#include "xf86.h" #include "xf86.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include <X11/X.h>
#include <X11/Xproto.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include "resource.h" #include "resource.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "xf86xvpriv.h" #include "xf86xvpriv.h"
#include "xf86xvmc.h" #include "xf86xvmc.h"