xkb: rename XkbAddGeomKey() to SrvXkbAddGeomKey()
Instead of doing dirty preprocessor trick, directly rename the function itself. (the renaming itself is necessary since libX11 has the same symbol) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
329a4e3b57
commit
0df6506f75
|
@ -676,7 +676,7 @@ XkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines)
|
||||||
}
|
}
|
||||||
|
|
||||||
XkbKeyPtr
|
XkbKeyPtr
|
||||||
XkbAddGeomKey(XkbRowPtr row)
|
SrvXkbAddGeomKey(XkbRowPtr row)
|
||||||
{
|
{
|
||||||
XkbKeyPtr key;
|
XkbKeyPtr key;
|
||||||
|
|
||||||
|
|
|
@ -5392,7 +5392,7 @@ _CheckSetSections(XkbGeometryPtr geom,
|
||||||
if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
|
if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1))
|
||||||
return BadLength;
|
return BadLength;
|
||||||
|
|
||||||
key = XkbAddGeomKey(row);
|
key = SrvXkbAddGeomKey(row);
|
||||||
if (!key)
|
if (!key)
|
||||||
return BadAlloc;
|
return BadAlloc;
|
||||||
memcpy(key->name.name, kWire->name, XkbKeyNameLength);
|
memcpy(key->name.name, kWire->name, XkbKeyNameLength);
|
||||||
|
|
|
@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
#include "xkbstr.h"
|
#include "xkbstr.h"
|
||||||
|
|
||||||
#define XkbAddGeomKey SrvXkbAddGeomKey
|
|
||||||
#define XkbAddGeomOutline SrvXkbAddGeomOutline
|
#define XkbAddGeomOutline SrvXkbAddGeomOutline
|
||||||
#define XkbAddGeomOverlay SrvXkbAddGeomOverlay
|
#define XkbAddGeomOverlay SrvXkbAddGeomOverlay
|
||||||
#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
|
#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
|
||||||
|
@ -331,8 +330,7 @@ extern XkbShapePtr XkbAddGeomShape(XkbGeometryPtr /* geom */ ,
|
||||||
int /* sz_outlines */
|
int /* sz_outlines */
|
||||||
);
|
);
|
||||||
|
|
||||||
extern XkbKeyPtr XkbAddGeomKey(XkbRowPtr /* row */
|
XkbKeyPtr SrvXkbAddGeomKey(XkbRowPtr row);
|
||||||
);
|
|
||||||
|
|
||||||
extern XkbRowPtr XkbAddGeomRow(XkbSectionPtr /* section */ ,
|
extern XkbRowPtr XkbAddGeomRow(XkbSectionPtr /* section */ ,
|
||||||
int /* sz_keys */
|
int /* sz_keys */
|
||||||
|
|
|
@ -1000,7 +1000,7 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom)
|
||||||
for (k = 0; k < rowWire.num_keys; k++) {
|
for (k = 0; k < rowWire.num_keys; k++) {
|
||||||
tmp = fread(&keyWire, SIZEOF(xkmKeyDesc), 1, file);
|
tmp = fread(&keyWire, SIZEOF(xkmKeyDesc), 1, file);
|
||||||
nRead += SIZEOF(xkmKeyDesc) * tmp;
|
nRead += SIZEOF(xkmKeyDesc) * tmp;
|
||||||
key = XkbAddGeomKey(row);
|
key = SrvXkbAddGeomKey(row);
|
||||||
if (!key) {
|
if (!key) {
|
||||||
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomSection", 0);
|
_XkbLibError(_XkbErrBadAlloc, "ReadXkmGeomSection", 0);
|
||||||
return nRead;
|
return nRead;
|
||||||
|
|
Loading…
Reference in New Issue