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

Revert "dix: unexport AllocColor()" 

libwfb.so has a reference to this function:

 $ nm -D ./build.debug/hw/xfree86/dixmods/libwfb.so | grep AllocColor
                  U AllocColor

This reverts commit b48e4a9cb7.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
This commit is contained in:
Aaron Plattner 2025-06-24 10:47:31 -07:00
parent 15ca09904a
commit 3d05f2b8a8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dix/colormap_priv.h
View File

@ -33,9 +33,6 @@ int TellGainedMap(WindowPtr pwin, void *value);
int CopyColormapAndFree(Colormap mid, ColormapPtr pSrc, int client); int CopyColormapAndFree(Colormap mid, ColormapPtr pSrc, int client);
int AllocColor(ColormapPtr pmap, unsigned short *pred, unsigned short *pgreen,
unsigned short *pblue, Pixel *pPix, int client );
void FakeAllocColor(ColormapPtr pmap, xColorItem *item); void FakeAllocColor(ColormapPtr pmap, xColorItem *item);
void FakeFreeColor(ColormapPtr pmap, Pixel pixel); void FakeFreeColor(ColormapPtr pmap, Pixel pixel);

3
fb/fbcmap_mi.c
View File

@ -30,9 +30,6 @@
#include <dix-config.h> #include <dix-config.h>
#include <X11/X.h> #include <X11/X.h>
#include "dix/colormap_priv.h"
#include "fb.h" #include "fb.h"
#include "micmap.h" #include "micmap.h"

7
include/colormap.h
View File

@ -55,6 +55,13 @@ SOFTWARE.
typedef CARD32 Pixel; typedef CARD32 Pixel;
extern _X_EXPORT int AllocColor(ColormapPtr /*pmap */ ,
unsigned short * /*pred */ ,
unsigned short * /*pgreen */ ,
unsigned short * /*pblue */ ,
Pixel * /*pPix */ ,
int /*client */ );
extern _X_EXPORT Bool ResizeVisualArray(ScreenPtr /* pScreen */ , extern _X_EXPORT Bool ResizeVisualArray(ScreenPtr /* pScreen */ ,
int /* new_vis_count */ , int /* new_vis_count */ ,
DepthPtr /* depth */ ); DepthPtr /* depth */ );