xkb: make XkbFreeGeomKeyAliases() static
Only used within one source file. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
e90440d683
commit
a5d973b909
|
|
@ -148,8 +148,8 @@ XkbFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||||
|
|
||||||
/***====================================================================***/
|
/***====================================================================***/
|
||||||
|
|
||||||
void
|
static void
|
||||||
XkbFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
SrvXkbFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||||
{
|
{
|
||||||
_XkbFreeGeomLeafElems(freeAll, first, count,
|
_XkbFreeGeomLeafElems(freeAll, first, count,
|
||||||
&geom->num_key_aliases, &geom->sz_key_aliases,
|
&geom->num_key_aliases, &geom->sz_key_aliases,
|
||||||
|
|
@ -366,7 +366,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
|
||||||
geom->num_doodads = geom->sz_doodads = 0;
|
geom->num_doodads = geom->sz_doodads = 0;
|
||||||
}
|
}
|
||||||
if ((which & XkbGeomKeyAliasesMask) && (geom->key_aliases != NULL))
|
if ((which & XkbGeomKeyAliasesMask) && (geom->key_aliases != NULL))
|
||||||
XkbFreeGeomKeyAliases(geom, 0, geom->num_key_aliases, TRUE);
|
SrvXkbFreeGeomKeyAliases(geom, 0, geom->num_key_aliases, TRUE);
|
||||||
if (freeMap) {
|
if (freeMap) {
|
||||||
free(geom->label_font);
|
free(geom->label_font);
|
||||||
geom->label_font = NULL;
|
geom->label_font = NULL;
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
#include "xkbstr.h"
|
#include "xkbstr.h"
|
||||||
|
|
||||||
#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases
|
|
||||||
#define XkbFreeGeomColors SrvXkbFreeGeomColors
|
#define XkbFreeGeomColors SrvXkbFreeGeomColors
|
||||||
#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
|
#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
|
||||||
#define XkbFreeGeomProperties SrvXkbFreeGeomProperties
|
#define XkbFreeGeomProperties SrvXkbFreeGeomProperties
|
||||||
|
|
@ -343,13 +342,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
|
||||||
XkbSectionPtr section,
|
XkbSectionPtr section,
|
||||||
Atom name);
|
Atom name);
|
||||||
|
|
||||||
extern void
|
|
||||||
XkbFreeGeomKeyAliases(XkbGeometryPtr /* geom */ ,
|
|
||||||
int /* first */ ,
|
|
||||||
int /* count */ ,
|
|
||||||
Bool /* freeAll */
|
|
||||||
);
|
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
XkbFreeGeomColors(XkbGeometryPtr /* geom */ ,
|
XkbFreeGeomColors(XkbGeometryPtr /* geom */ ,
|
||||||
int /* first */ ,
|
int /* first */ ,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue