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

Revert "dix: unexport rootCursor"

Browse source 
This reverts commit a2f72755a9.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058>
This commit is contained in:
Alan Coopersmith 2025-08-31 12:29:37 -07:00 • committed by Marge Bot
parent b858cb5ccd
commit b644922366
6 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Xi/xichangecursor.c
View file

@ -36,7 +36,6 @@
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XI2proto.h> #include <X11/extensions/XI2proto.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "inputstr.h" /* DeviceIntPtr */ #include "inputstr.h" /* DeviceIntPtr */

12
dix/cursor_priv.h
View file

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_DIX_CURSOR_PRIV_H
#define _XSERVER_DIX_CURSOR_PRIV_H
#include "include/cursor.h"
extern CursorPtr rootCursor;
#endif /* _XSERVER_DIX_CURSOR_PRIV_H */

1
dix/globals.c
View file

@ -49,7 +49,6 @@ SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "misc.h" #include "misc.h"

1
dix/main.c
View file

@ -86,7 +86,6 @@ Equipment Corporation.
#include "config/hotplug_priv.h" #include "config/hotplug_priv.h"
#include "dix/callback_priv.h" #include "dix/callback_priv.h"
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"
#include "dix/gc_priv.h" #include "dix/gc_priv.h"

1
dix/window.c
View file

@ -99,7 +99,6 @@ Equipment Corporation.
#include <dix-config.h> #include <dix-config.h>
#include "dix/colormap_priv.h" #include "dix/colormap_priv.h"
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/exevents_priv.h" #include "dix/exevents_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"

2
include/cursor.h
View file

@ -67,6 +67,8 @@ typedef struct _Cursor *CursorPtr;
typedef struct _Cursor const *ConstCursorPtr; typedef struct _Cursor const *ConstCursorPtr;
typedef struct _CursorMetric *CursorMetricPtr; typedef struct _CursorMetric *CursorMetricPtr;
extern _X_EXPORT CursorPtr rootCursor;
extern _X_EXPORT int FreeCursor(void *pCurs, extern _X_EXPORT int FreeCursor(void *pCurs,
XID cid); XID cid);