diff --git a/include/xkbrules.h b/include/xkbrules.h index 97887ec78..74473cb24 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -80,6 +80,14 @@ typedef struct _XkbRF_Rules { _XFUNCPROTOBEGIN +/* Seems preferable to dragging xkbstr.h in. */ + struct _XkbComponentNames; + +extern _X_EXPORT Bool XkbRF_GetComponents(XkbRF_RulesPtr /* rules */ , + XkbRF_VarDefsPtr /* var_defs */ , + struct _XkbComponentNames * /* names */ + ); + extern _X_EXPORT Bool XkbRF_LoadRules(FILE * /* file */ , XkbRF_RulesPtr /* rules */ ); diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 8001cb25d..e147aabce 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -42,7 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "os/osdep.h" #include "xkb/xkbfile_priv.h" #include "xkb/xkbfmisc_priv.h" -#include "xkb/xkbrules_priv.h" #include "inputstr.h" #include "scrnintstr.h" diff --git a/xkb/maprules.c b/xkb/maprules.c index 83abe8076..395b5bfab 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -40,9 +40,6 @@ #include #include #include - -#include "xkb/xkbrules_priv.h" - #include "misc.h" #include "inputstr.h" #include "dix.h" diff --git a/xkb/xkbrules_priv.h b/xkb/xkbrules_priv.h deleted file mode 100644 index 7e73ec7a3..000000000 --- a/xkb/xkbrules_priv.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: MIT OR X11 - * - * Copyright © 2024 Enrico Weigelt, metux IT consult - */ -#ifndef _XSERVER_XKB_XKBRULES_PRIV_H -#define _XSERVER_XKB_XKBRULES_PRIV_H - -#include - -#include "include/xkbrules.h" - -struct _XkbComponentNames; - -Bool XkbRF_GetComponents(XkbRF_RulesPtr rules, - XkbRF_VarDefsPtr var_defs, - struct _XkbComponentNames *names); - -#endif /* _XSERVER_XKB_XKBRULES_PRIV_H */