fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 07:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "dix: unexport ServerBitsFromGlyph()"

Browse source 
This reverts commit 974cd2b5f2.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
This commit is contained in:
Alan Coopersmith 2025-08-31 12:28:45 -07:00 • committed by Marge Bot
parent e85fe61714
commit cfdcd22199
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dix/cursor_priv.h
View file

@ -5,7 +5,6 @@
#ifndef _XSERVER_DIX_CURSOR_PRIV_H
#define _XSERVER_DIX_CURSOR_PRIV_H
#include <X11/fonts/font.h>
#include <X11/X.h>
#include <X11/Xmd.h>
@ -49,9 +48,4 @@ int AllocGlyphCursor(Font source,
CursorPtr CreateRootCursor(void);
int ServerBitsFromGlyph(FontPtr pfont,
unsigned int ch,
CursorMetricPtr cm,
unsigned char **ppbits);
#endif /* _XSERVER_DIX_CURSOR_PRIV_H */

2
dix/glyphcurs.c
View file

@ -46,8 +46,6 @@ SOFTWARE.
#include <dix-config.h>
#include "dix/cursor_priv.h"
#include "misc.h"
#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"

5
include/cursor.h
View file

@ -70,6 +70,11 @@ typedef struct _CursorMetric *CursorMetricPtr;
extern _X_EXPORT int FreeCursor(void *pCurs,
XID cid);
extern _X_EXPORT int ServerBitsFromGlyph(FontPtr /*pfont */ ,
unsigned int /*ch */ ,
CursorMetricPtr /*cm */ ,
unsigned char ** /*ppbits */ );
extern _X_EXPORT Bool CursorMetricsFromGlyph(FontPtr /*pfont */ ,
unsigned /*ch */ ,
CursorMetricPtr /*cm */ );