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 "Xace: unexport Xace functions"

Browse source 
This reverts commit 3e0a4ab712.
This commit is contained in:
kohnish 2025-11-21 21:21:39 +01:00
parent 2dab709030
commit 1587be832f
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Xext/xace.h
View file

@ -55,29 +55,31 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_KEY_AVAIL 14 #define XACE_KEY_AVAIL 14
#define XACE_NUM_HOOKS 15 #define XACE_NUM_HOOKS 15
extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; extern _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
/* Entry point for hook functions. Called by Xserver. /* Entry point for hook functions. Called by Xserver.
* Required by libdbe and libextmod * Required by libdbe and libextmod
*/ */
/* needs to be exported for in-tree modsetting driver, but not part extern _X_EXPORT int XaceHook(int /*hook */ ,
of public API for external modules */ ... /*appropriate args for hook */
_X_EXPORT int XaceHook(int hook, ... /* appropriate args for hook */); );
/* determine whether any callbacks are present for the XACE hook */ /* determine whether any callbacks are present for the XACE hook */
int XaceHookIsSet(int hook); extern _X_EXPORT int XaceHookIsSet(int hook);
/* Special-cased hook functions /* Special-cased hook functions
*/ */
int XaceHookDispatch0(ClientPtr ptr, int major); int XaceHookDispatch0(ClientPtr client, int major);
#define XaceHookDispatch(c, m) \ #define XaceHookDispatch(c, m) \
((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \ ((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \
XaceHookDispatch0((c), (m)) : \ XaceHookDispatch0((c), (m)) : \
Success) Success)
int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp, extern _X_EXPORT int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
Mask access_mode); PropertyPtr *ppProp,
int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel, Mask access_mode); Mask access_mode);
extern _X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr, Selection ** ppSel,
Mask access_mode);
/* needs to be exported for in-tree modsetting, but not part of public API */ /* needs to be exported for in-tree modsetting, but not part of public API */
_X_EXPORT int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res, _X_EXPORT int XaceHookResourceAccess(ClientPtr client, XID id, RESTYPE rtype, void *res,
@ -109,18 +111,18 @@ int XaceHookKeyAvail(xEventPtr ev, DeviceIntPtr dev, int count);
/* XTrans wrappers for use by security modules /* XTrans wrappers for use by security modules
*/ */
int XaceGetConnectionNumber(ClientPtr ptr); extern _X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr);
int XaceIsLocal(ClientPtr ptr); extern _X_EXPORT int XaceIsLocal(ClientPtr ptr);
/* From the original Security extension... /* From the original Security extension...
*/ */
void XaceCensorImage(ClientPtr client, extern _X_EXPORT void XaceCensorImage(ClientPtr client,
RegionPtr pVisibleRegion, RegionPtr pVisibleRegion,
long widthBytesLine, long widthBytesLine,
DrawablePtr pDraw, DrawablePtr pDraw,
int x, int y, int w, int h, int x, int y, int w, int h,
unsigned int format, char *pBuf); unsigned int format, char *pBuf);
#else /* XACE */ #else /* XACE */