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

xfree86: move private definitions out of dri2.h 

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1290>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-13 10:00:35 +01:00 committed by Marge Bot
parent 00c2a8fb0a
commit 1d3c26446d
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/dri2/dri2.c
View File

@ -42,7 +42,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "windowstr.h" #include "windowstr.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "dri2.h" #include "dri2_priv.h"
#include "dri2int.h" #include "dri2int.h"
#include "damage.h" #include "damage.h"
#include "xf86.h" #include "xf86.h"

3
hw/xfree86/dri2/dri2.h
View File

@ -46,9 +46,6 @@ typedef struct {
void *driverPrivate; void *driverPrivate;
} DRI2BufferRec, *DRI2BufferPtr; } DRI2BufferRec, *DRI2BufferPtr;
extern CARD8 dri2_major; /* version of DRI2 supported by DDX */
extern CARD8 dri2_minor;
typedef DRI2BufferRec DRI2Buffer2Rec, *DRI2Buffer2Ptr; typedef DRI2BufferRec DRI2Buffer2Rec, *DRI2Buffer2Ptr;
typedef void (*DRI2SwapEventPtr) (ClientPtr client, void *data, int type, typedef void (*DRI2SwapEventPtr) (ClientPtr client, void *data, int type,
CARD64 ust, CARD64 msc, CARD32 sbc); CARD64 ust, CARD64 msc, CARD32 sbc);

13
hw/xfree86/dri2/dri2_priv.h Normal file
View File

@ -0,0 +1,13 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_DRI2_PRIV_H_
#define _XSERVER_DRI2_PRIV_H_
#include "dri2.h"
extern CARD8 dri2_major; /* version of DRI2 supported by DDX */
extern CARD8 dri2_minor;
#endif /* _XSERVER_DRI2_PRIV_H_ */

2
hw/xfree86/dri2/dri2ext.c
View File

@ -46,7 +46,7 @@
#include "pixmapstr.h" #include "pixmapstr.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "xfixes.h" #include "xfixes.h"
#include "dri2.h" #include "dri2_priv.h"
#include "dri2int.h" #include "dri2int.h"
#include "protocol-versions.h" #include "protocol-versions.h"