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

xfree86: modes: move private definitions out of from xf86RandR12.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-09 17:48:18 +01:00 committed by Marge Bot
parent 013eaacdd0
commit ac5e95be49
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86cmap.c
View File

@ -47,7 +47,7 @@
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "xf86str.h" #include "xf86str.h"
#include "micmap.h" #include "micmap.h"
#include "xf86RandR12.h" #include "xf86RandR12_priv.h"
#include "xf86Crtc.h" #include "xf86Crtc.h"
#ifdef XFreeXDGA #ifdef XFreeXDGA

2
hw/xfree86/modes/xf86RandR12.c
View File

@ -42,7 +42,7 @@
#include "xf86cmap.h" #include "xf86cmap.h"
#include "xf86Crtc.h" #include "xf86Crtc.h"
#include "xf86RandR12.h" #include "xf86RandR12_priv.h"
typedef struct _xf86RandR12Info { typedef struct _xf86RandR12Info {
int virtualX; int virtualX;

5
hw/xfree86/modes/xf86RandR12.h
View File

@ -40,9 +40,4 @@ extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn,
extern _X_EXPORT Bool xf86RandR12PreInit(ScrnInfoPtr pScrn); extern _X_EXPORT Bool xf86RandR12PreInit(ScrnInfoPtr pScrn);
extern _X_EXPORT void xf86RandR12TellChanged(ScreenPtr pScreen); extern _X_EXPORT void xf86RandR12TellChanged(ScreenPtr pScreen);
extern void xf86RandR12LoadPalette(ScrnInfoPtr pScrn, int numColors,
int *indices, LOCO *colors,
VisualPtr pVisual);
extern Bool xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize);
#endif /* _XF86_RANDR_H_ */ #endif /* _XF86_RANDR_H_ */

18
hw/xfree86/modes/xf86RandR12_priv.h Normal file
View File

@ -0,0 +1,18 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_XF86RANDR12_PRIV_H_
#define _XSERVER_XF86RANDR12_PRIV_H_
#include <X11/extensions/render.h>
#include "randrstr.h"
#include "xf86RandR12.h"
void xf86RandR12LoadPalette(ScrnInfoPtr pScrn, int numColors,
int *indices, LOCO *colors,
VisualPtr pVisual);
Bool xf86RandR12InitGamma(ScrnInfoPtr pScrn, unsigned gammaSize);
#endif /* _XSERVER_XF86RANDR12_PRIV_H_ */