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

include: colormap.h: move internal typedef to dix/colormap_priv.h 

Moving the internal EntryType typedef from "colormap.h" into newly added
internal-only header "dix/colormap_priv.h"

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1283>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-08 17:30:50 +01:00 committed by Marge Bot
parent 94451181c2
commit 140b75298a
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dix/colormap.c
View File

@ -53,6 +53,9 @@ SOFTWARE.
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include "dix/colormap_priv.h"
#include "misc.h" #include "misc.h"
#include "dix.h" #include "dix.h"
#include "dixstruct.h" #include "dixstruct.h"

10
dix/colormap_priv.h Normal file
View File

@ -0,0 +1,10 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_DIX_COLORMAP_PRIV_H
#define _XSERVER_DIX_COLORMAP_PRIv_H
typedef struct _CMEntry *EntryPtr;
#endif /* _XSERVER_DIX_COLORMAP_PRIV_H */

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

@ -40,6 +40,8 @@
#include <X11/X.h> #include <X11/X.h>
#include "misc.h" #include "misc.h"
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "dix/colormap_priv.h"
#include "colormapst.h" #include "colormapst.h"
#include "scrnintstr.h" #include "scrnintstr.h"

1
include/colormap.h
View File

@ -70,7 +70,6 @@ SOFTWARE.
#define BeingCreated 4 #define BeingCreated 4
typedef CARD32 Pixel; typedef CARD32 Pixel;
typedef struct _CMEntry *EntryPtr;
/* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */ /* moved to screenint.h: typedef struct _ColormapRec *ColormapPtr */
typedef struct _colorResource *colorResourcePtr; typedef struct _colorResource *colorResourcePtr;