diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-06-28 12:50:24 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-09-01 22:06:50 +0000 |
| commit | 1bfa4876f688412c97043408561a4d895ebf08cc (patch) | |
| tree | 523e41032e4b36db508fa96365003af42c9ed835 /hw/xwin | |
| parent | 7ba3fc3a541c0190ba21cd1f3983ed2e45e686cd (diff) | |
dix: move colormap flags into colormap_priv.h and rename them
These aren't used by any drivers/modules, so no need to keep them exported.
As already touching them, give them a proper name prefix for clarity.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581>
Diffstat (limited to 'hw/xwin')
| -rw-r--r-- | hw/xwin/winshadddnl.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winshadgdi.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index 2884134b4..38ce01f08 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -36,6 +36,8 @@ #endif #include "win.h" +#include "dix/colormap_priv.h" + #define FAIL_MSG_MAX_BLT 10 /* @@ -1135,7 +1137,7 @@ winDestroyColormapShadowDDNL(ColormapPtr pColormap) * will not have had winUninstallColormap called on it. Thus, * we need to handle the default colormap in a special way. */ - if (pColormap->flags & IsDefault) { + if (pColormap->flags & CM_IsDefault) { #if ENABLE_DEBUG winDebug ("winDestroyColormapShadowDDNL - Destroying default colormap\n"); diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 560b50cf9..f8317ad27 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -33,6 +33,8 @@ #endif #include "win.h" +#include "dix/colormap_priv.h" + /* * Local function prototypes */ @@ -1209,7 +1211,7 @@ winDestroyColormapShadowGDI(ColormapPtr pColormap) * will not have had winUninstallColormap called on it. Thus, * we need to handle the default colormap in a special way. */ - if (pColormap->flags & IsDefault) { + if (pColormap->flags & CM_IsDefault) { #if ENABLE_DEBUG winDebug("winDestroyColormapShadowGDI - Destroying default " "colormap\n"); |