Remove needless exporting of pretty much every symbol in XKB, but leave
just enough so that drivers can build their own keymaps if necessary.
Signed-off-by: Daniel Stone <dan...@fooishbar.org>
---
include/xkbfile.h | 60 ++++++++++----------
include/xkbrules.h | 10 ++--
include/xkbsrv.h | 160 ++++++++++++++++++++++++++--------------------------
3 files changed, 115 insertions(+), 115 deletions(-)
diff --git a/include/xkbfile.h b/include/xkbfile.h
index db7dbfa..5c5b74d 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -82,97 +82,97 @@ typedef void (*XkbFileAddOnFunc)(
_XFUNCPROTOBEGIN
-extern _X_EXPORT char * XkbIndentText(
+extern char * XkbIndentText(
unsigned /* size */
);
-extern _X_EXPORT char * XkbAtomText(
+extern char * XkbAtomText(
Atom /* atm */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbKeysymText(
+extern char * XkbKeysymText(
KeySym /* sym */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbStringText(
+extern char * XkbStringText(
char * /* str */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbKeyNameText(
+extern char * XkbKeyNameText(
char * /* name */,
unsigned /* format */
);
-extern _X_EXPORT char *
+extern char *
XkbModIndexText(
unsigned /* ndx */,
unsigned /* format */
);
-extern _X_EXPORT char *
+extern char *
XkbModMaskText(
unsigned /* mask */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbVModIndexText(
+extern char * XkbVModIndexText(
XkbDescPtr /* xkb */,
unsigned /* ndx */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbVModMaskText(
+extern char * XkbVModMaskText(
XkbDescPtr /* xkb */,
unsigned /* modMask */,
unsigned /* mask */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbConfigText(
+extern char * XkbConfigText(
unsigned /* config */,
unsigned /* format */
);
-extern _X_EXPORT const char * XkbSIMatchText(
+extern const char * XkbSIMatchText(
unsigned /* type */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbIMWhichStateMaskText(
+extern char * XkbIMWhichStateMaskText(
unsigned /* use_which */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbControlsMaskText(
+extern char * XkbControlsMaskText(
unsigned /* ctrls */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbGeomFPText(
+extern char * XkbGeomFPText(
int /* val */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbDoodadTypeText(
+extern char * XkbDoodadTypeText(
unsigned /* type */,
unsigned /* format */
);
-extern _X_EXPORT const char * XkbActionTypeText(
+extern const char * XkbActionTypeText(
unsigned /* type */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbActionText(
+extern char * XkbActionText(
XkbDescPtr /* xkb */,
XkbAction * /* action */,
unsigned /* format */
);
-extern _X_EXPORT char * XkbBehaviorText(
+extern char * XkbBehaviorText(
XkbDescPtr /* xkb */,
XkbBehavior * /* behavior */,
unsigned /* format */
@@ -193,7 +193,7 @@ extern _X_EXPORT unsigned _XkbKSCheckCase(
KeySym /* sym */
);
-extern _X_EXPORT int XkbFindKeycodeByName(
+extern int XkbFindKeycodeByName(
XkbDescPtr /* xkb */,
char * /* name */,
Bool /* use_aliases */
@@ -201,7 +201,7 @@ extern _X_EXPORT int XkbFindKeycodeByName(
/***====================================================================***/
-extern _X_EXPORT Atom XkbInternAtom(
+extern Atom XkbInternAtom(
char * /* name */,
Bool /* onlyIfExists */
);
@@ -227,19 +227,19 @@ typedef struct _XkbDrawable {
/***====================================================================***/
-extern _X_EXPORT unsigned XkbConvertGetByNameComponents(
+extern unsigned XkbConvertGetByNameComponents(
Bool /* toXkm */,
unsigned /* orig */
);
-extern _X_EXPORT Bool XkbNameMatchesPattern(
+extern Bool XkbNameMatchesPattern(
char * /* name */,
char * /* pattern */
);
/***====================================================================***/
-extern _X_EXPORT Bool XkbWriteXKBKeycodes(
+extern Bool XkbWriteXKBKeycodes(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
@@ -248,7 +248,7 @@ extern _X_EXPORT Bool XkbWriteXKBKeycodes(
void * /* priv */
);
-extern _X_EXPORT Bool XkbWriteXKBKeyTypes(
+extern Bool XkbWriteXKBKeyTypes(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
@@ -257,7 +257,7 @@ extern _X_EXPORT Bool XkbWriteXKBKeyTypes(
void * /* priv */
);
-extern _X_EXPORT Bool XkbWriteXKBCompatMap(
+extern Bool XkbWriteXKBCompatMap(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
@@ -266,7 +266,7 @@ extern _X_EXPORT Bool XkbWriteXKBCompatMap(
void * /* priv */
);
-extern _X_EXPORT Bool XkbWriteXKBSymbols(
+extern Bool XkbWriteXKBSymbols(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
@@ -275,7 +275,7 @@ extern _X_EXPORT Bool XkbWriteXKBSymbols(
void * /* priv */
);
-extern _X_EXPORT Bool XkbWriteXKBGeometry(
+extern Bool XkbWriteXKBGeometry(
FILE * /* file */,
XkbDescPtr /* result */,
Bool /* topLevel */,
@@ -284,7 +284,7 @@ extern _X_EXPORT Bool XkbWriteXKBGeometry(
void * /* priv */
);
-extern _X_EXPORT Bool XkbWriteXKBKeymapForNames(
+extern Bool XkbWriteXKBKeymapForNames(
FILE * /* file */,
XkbComponentNamesPtr /* names */,
XkbDescPtr /* xkb */,
@@ -294,11 +294,11 @@ extern _X_EXPORT Bool XkbWriteXKBKeymapForNames(
/***====================================================================***/
-extern _X_EXPORT Bool XkmProbe(
+extern Bool XkmProbe(
FILE * /* file */
);
-extern _X_EXPORT unsigned XkmReadFile(
+extern unsigned XkmReadFile(
FILE * /* file */,
unsigned /* need */,
unsigned /* want */,
diff --git a/include/xkbrules.h b/include/xkbrules.h
index 0f3f934..a8e8124 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -89,18 +89,18 @@ _XFUNCPROTOBEGIN
/* Seems preferable to dragging xkbstr.h in. */
struct _XkbComponentNames;
-extern _X_EXPORT Bool XkbRF_GetComponents(
+extern Bool XkbRF_GetComponents(
XkbRF_RulesPtr /* rules */,
XkbRF_VarDefsPtr /* var_defs */,
struct _XkbComponentNames * /* names */
);
-extern _X_EXPORT Bool XkbRF_LoadRules(
+extern Bool XkbRF_LoadRules(
FILE * /* file */,
XkbRF_RulesPtr /* rules */
);
-extern _X_EXPORT Bool XkbRF_LoadRulesByName(
+extern Bool XkbRF_LoadRulesByName(
char * /* base */,
char * /* locale */,
XkbRF_RulesPtr /* rules */
@@ -108,9 +108,9 @@ extern _X_EXPORT Bool XkbRF_LoadRulesByName(
/***====================================================================***/
-extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create(void);
+extern XkbRF_RulesPtr XkbRF_Create(void);
-extern _X_EXPORT void XkbRF_Free(
+extern void XkbRF_Free(
XkbRF_RulesPtr /* rules */,
Bool /* freeRules */
);
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 7b00534..cbf3fc1 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -293,51 +293,51 @@ extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc,
pointer);
/***====================================================================***/
-extern _X_EXPORT int XkbReqCode;
-extern _X_EXPORT int XkbEventBase;
-extern _X_EXPORT int XkbKeyboardErrorCode;
-extern _X_EXPORT const char * XkbBaseDirectory;
-extern _X_EXPORT const char * XkbBinDirectory;
+extern int XkbReqCode;
+extern int XkbEventBase;
+extern int XkbKeyboardErrorCode;
+extern const char * XkbBaseDirectory;
+extern const char * XkbBinDirectory;
-extern _X_EXPORT CARD32 xkbDebugFlags;
+extern CARD32 xkbDebugFlags;
#define _XkbLibError(c,l,d) /* Epoch fail */
#define _XkbErrCode2(a,b) ((XID)((((unsigned
int)(a))<<24)|((b)&0xffffff)))
#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned
int)(b))<<16)|(c))
#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned
int)(c))<<8)|(d)))
-extern _X_EXPORT int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
-extern _X_EXPORT int DeviceButtonPress,DeviceButtonRelease;
+extern int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
+extern int DeviceButtonPress,DeviceButtonRelease;
#define Status int
-extern _X_EXPORT void XkbUseMsg(
+extern void XkbUseMsg(
void
);
-extern _X_EXPORT int XkbProcessArguments(
+extern int XkbProcessArguments(
int /* argc */,
char ** /* argv */,
int /* i */
);
-extern _X_EXPORT Bool XkbInitPrivates(void);
+extern Bool XkbInitPrivates(void);
-extern _X_EXPORT void XkbSetExtension(DeviceIntPtr device, ProcessInputProc
proc);
+extern void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
-extern _X_EXPORT void XkbFreeCompatMap(
+extern void XkbFreeCompatMap(
XkbDescPtr /* xkb */,
unsigned int /* which */,
Bool /* freeMap */
);
-extern _X_EXPORT void XkbFreeNames(
+extern void XkbFreeNames(
XkbDescPtr /* xkb */,
unsigned int /* which */,
Bool /* freeMap */
);
-extern _X_EXPORT int _XkbLookupAnyDevice(
+extern int _XkbLookupAnyDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
@@ -345,7 +345,7 @@ extern _X_EXPORT int _XkbLookupAnyDevice(
int *xkb_err
);
-extern _X_EXPORT int _XkbLookupKeyboard(
+extern int _XkbLookupKeyboard(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
@@ -353,7 +353,7 @@ extern _X_EXPORT int _XkbLookupKeyboard(
int *xkb_err
);
-extern _X_EXPORT int _XkbLookupBellDevice(
+extern int _XkbLookupBellDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
@@ -361,7 +361,7 @@ extern _X_EXPORT int _XkbLookupBellDevice(
int *xkb_err
);
-extern _X_EXPORT int _XkbLookupLedDevice(
+extern int _XkbLookupLedDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
@@ -369,7 +369,7 @@ extern _X_EXPORT int _XkbLookupLedDevice(
int *xkb_err
);
-extern _X_EXPORT int _XkbLookupButtonDevice(
+extern int _XkbLookupButtonDevice(
DeviceIntPtr *pDev,
int id,
ClientPtr client,
@@ -447,29 +447,29 @@ extern _X_EXPORT void XkbFreeKeyboard(
Bool /* freeDesc */
);
-extern _X_EXPORT void XkbFreeComponentNames(
+extern void XkbFreeComponentNames(
XkbComponentNamesPtr /* names */,
Bool /* freeNames */
);
-extern _X_EXPORT void XkbSetActionKeyMods(
+extern void XkbSetActionKeyMods(
XkbDescPtr /* xkb */,
XkbAction * /* act */,
unsigned int /* mods */
);
-extern _X_EXPORT unsigned int XkbMaskForVMask(
+extern unsigned int XkbMaskForVMask(
XkbDescPtr /* xkb */,
unsigned int /* vmask */
);
-extern _X_EXPORT Bool XkbVirtualModsToReal(
+extern Bool XkbVirtualModsToReal(
XkbDescPtr /* xkb */,
unsigned int /* virtua_mask */,
unsigned int * /* mask_rtrn */
);
-extern _X_EXPORT unsigned int XkbAdjustGroup(
+extern unsigned int XkbAdjustGroup(
int /* group */,
XkbControlsPtr /* ctrls */
);
@@ -486,7 +486,7 @@ extern _X_EXPORT XkbAction *XkbResizeKeyActions(
int /* needed */
);
-extern _X_EXPORT void XkbUpdateKeyTypesFromCore(
+extern void XkbUpdateKeyTypesFromCore(
DeviceIntPtr /* pXDev */,
KeySymsPtr /* syms */,
KeyCode /* first */,
@@ -494,14 +494,14 @@ extern _X_EXPORT void XkbUpdateKeyTypesFromCore(
XkbChangesPtr /* pChanges */
);
-extern _X_EXPORT void XkbUpdateDescActions(
+extern void XkbUpdateDescActions(
XkbDescPtr /* xkb */,
KeyCode /* first */,
CARD8 /* num */,
XkbChangesPtr /* changes */
);
-extern _X_EXPORT void XkbUpdateActions(
+extern void XkbUpdateActions(
DeviceIntPtr /* pXDev */,
KeyCode /* first */,
CARD8 /* num */,
@@ -538,7 +538,7 @@ extern _X_EXPORT void XkbUpdateIndicators(
XkbEventCausePtr /* cause */
);
-extern _X_EXPORT XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
+extern XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
DeviceIntPtr /* dev */,
KbdFeedbackPtr /* kf */,
LedFeedbackPtr /* lf */,
@@ -553,7 +553,7 @@ extern _X_EXPORT XkbSrvLedInfoPtr XkbCopySrvLedInfo(
);
-extern _X_EXPORT XkbSrvLedInfoPtr XkbFindSrvLedInfo(
+extern XkbSrvLedInfoPtr XkbFindSrvLedInfo(
DeviceIntPtr /* dev */,
unsigned int /* class */,
unsigned int /* id */,
@@ -587,7 +587,7 @@ extern _X_EXPORT void XkbApplyLedStateChanges(
XkbEventCausePtr /* cause */
);
-extern _X_EXPORT void XkbFlushLedEvents(
+extern void XkbFlushLedEvents(
DeviceIntPtr /* dev */,
DeviceIntPtr /* kbd */,
XkbSrvLedInfoPtr /* sli */,
@@ -596,17 +596,17 @@ extern _X_EXPORT void XkbFlushLedEvents(
XkbEventCausePtr /* cause */
);
-extern _X_EXPORT unsigned int XkbIndicatorsToUpdate(
+extern unsigned int XkbIndicatorsToUpdate(
DeviceIntPtr /* dev */,
unsigned long /* state_changes */,
Bool /* enabled_ctrl_changes */
);
-extern _X_EXPORT void XkbComputeDerivedState(
+extern void XkbComputeDerivedState(
XkbSrvInfoPtr /* xkbi */
);
-extern _X_EXPORT void XkbCheckSecondaryEffects(
+extern void XkbCheckSecondaryEffects(
XkbSrvInfoPtr /* xkbi */,
unsigned int /* which */,
XkbChangesPtr /* changes */,
@@ -624,17 +624,17 @@ extern _X_EXPORT unsigned int XkbStateChangedFlags(
XkbStatePtr /* new */
);
-extern _X_EXPORT void XkbSendStateNotify(
+extern void XkbSendStateNotify(
DeviceIntPtr /* kbd */,
xkbStateNotify * /* pSN */
);
-extern _X_EXPORT void XkbSendMapNotify(
+extern void XkbSendMapNotify(
DeviceIntPtr /* kbd */,
xkbMapNotify * /* ev */
);
-extern _X_EXPORT int XkbComputeControlsNotify(
+extern int XkbComputeControlsNotify(
DeviceIntPtr /* kbd */,
XkbControlsPtr /* old */,
XkbControlsPtr /* new */,
@@ -642,12 +642,12 @@ extern _X_EXPORT int XkbComputeControlsNotify(
Bool /* forceCtrlProc */
);
-extern _X_EXPORT void XkbSendControlsNotify(
+extern void XkbSendControlsNotify(
DeviceIntPtr /* kbd */,
xkbControlsNotify * /* ev */
);
-extern _X_EXPORT void XkbSendCompatMapNotify(
+extern void XkbSendCompatMapNotify(
DeviceIntPtr /* kbd */,
xkbCompatMapNotify * /* ev */
);
@@ -664,45 +664,45 @@ extern _X_EXPORT void XkbHandleBell(
ClientPtr /* pClient */
);
-extern _X_EXPORT void XkbSendAccessXNotify(
+extern void XkbSendAccessXNotify(
DeviceIntPtr /* kbd */,
xkbAccessXNotify * /* pEv */
);
-extern _X_EXPORT void XkbSendNamesNotify(
+extern void XkbSendNamesNotify(
DeviceIntPtr /* kbd */,
xkbNamesNotify * /* ev */
);
-extern _X_EXPORT void XkbSendActionMessage(
+extern void XkbSendActionMessage(
DeviceIntPtr /* kbd */,
xkbActionMessage * /* ev */
);
-extern _X_EXPORT void XkbSendExtensionDeviceNotify(
+extern void XkbSendExtensionDeviceNotify(
DeviceIntPtr /* kbd */,
ClientPtr /* client */,
xkbExtensionDeviceNotify * /* ev */
);
-extern _X_EXPORT void XkbSendNotification(
+extern void XkbSendNotification(
DeviceIntPtr /* kbd */,
XkbChangesPtr /* pChanges */,
XkbEventCausePtr /* cause */
);
-extern _X_EXPORT void XkbProcessKeyboardEvent(
+extern void XkbProcessKeyboardEvent(
DeviceEvent* /* event */,
DeviceIntPtr /* keybd */
);
-extern _X_EXPORT void XkbHandleActions(
+extern void XkbHandleActions(
DeviceIntPtr /* dev */,
DeviceIntPtr /* kbd */,
DeviceEvent* /* event */
);
-extern _X_EXPORT Bool XkbEnableDisableControls(
+extern Bool XkbEnableDisableControls(
XkbSrvInfoPtr /* xkbi */,
unsigned long /* change */,
unsigned long /* newValues */,
@@ -710,121 +710,121 @@ extern _X_EXPORT Bool XkbEnableDisableControls(
XkbEventCausePtr /* cause */
);
-extern _X_EXPORT void AccessXInit(
+extern void AccessXInit(
DeviceIntPtr /* dev */
);
-extern _X_EXPORT Bool AccessXFilterPressEvent(
+extern Bool AccessXFilterPressEvent(
DeviceEvent* /* event */,
DeviceIntPtr /* keybd */
);
-extern _X_EXPORT Bool AccessXFilterReleaseEvent(
+extern Bool AccessXFilterReleaseEvent(
DeviceEvent* /* event */,
DeviceIntPtr /* keybd */
);
-extern _X_EXPORT void AccessXCancelRepeatKey(
+extern void AccessXCancelRepeatKey(
XkbSrvInfoPtr /* xkbi */,
KeyCode /* key */
);
-extern _X_EXPORT void AccessXComputeCurveFactor(
+extern void AccessXComputeCurveFactor(
XkbSrvInfoPtr /* xkbi */,
XkbControlsPtr /* ctrls */
);
-extern _X_EXPORT XkbInterestPtr XkbFindClientResource(
+extern XkbInterestPtr XkbFindClientResource(
DevicePtr /* inDev */,
ClientPtr /* client */
);
-extern _X_EXPORT XkbInterestPtr XkbAddClientResource(
+extern XkbInterestPtr XkbAddClientResource(
DevicePtr /* inDev */,
ClientPtr /* client */,
XID /* id */
);
-extern _X_EXPORT int XkbRemoveResourceClient(
+extern int XkbRemoveResourceClient(
DevicePtr /* inDev */,
XID /* id */
);
-extern _X_EXPORT int XkbDDXAccessXBeep(
+extern int XkbDDXAccessXBeep(
DeviceIntPtr /* dev */,
unsigned int /* what */,
unsigned int /* which */
);
-extern _X_EXPORT int XkbDDXUsesSoftRepeat(
+extern int XkbDDXUsesSoftRepeat(
DeviceIntPtr /* dev */
);
-extern _X_EXPORT void XkbDDXKeybdCtrlProc(
+extern void XkbDDXKeybdCtrlProc(
DeviceIntPtr /* dev */,
KeybdCtrl * /* ctrl */
);
-extern _X_EXPORT void XkbDDXChangeControls(
+extern void XkbDDXChangeControls(
DeviceIntPtr /* dev */,
XkbControlsPtr /* old */,
XkbControlsPtr /* new */
);
-extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(
+extern void XkbDDXUpdateDeviceIndicators(
DeviceIntPtr /* dev */,
XkbSrvLedInfoPtr /* sli */,
CARD32 /* newState */
);
-extern _X_EXPORT int XkbDDXTerminateServer(
+extern int XkbDDXTerminateServer(
DeviceIntPtr /* dev */,
KeyCode /* key */,
XkbAction * /* act */
);
-extern _X_EXPORT int XkbDDXSwitchScreen(
+extern int XkbDDXSwitchScreen(
DeviceIntPtr /* dev */,
KeyCode /* key */,
XkbAction * /* act */
);
-extern _X_EXPORT int XkbDDXPrivate(
+extern int XkbDDXPrivate(
DeviceIntPtr /* dev */,
KeyCode /* key */,
XkbAction * /* act */
);
-extern _X_EXPORT void XkbDisableComputedAutoRepeats(
+extern void XkbDisableComputedAutoRepeats(
DeviceIntPtr /* pXDev */,
unsigned int /* key */
);
-extern _X_EXPORT void XkbSetRepeatKeys(
+extern void XkbSetRepeatKeys(
DeviceIntPtr /* pXDev */,
int /* key */,
int /* onoff */
);
-extern _X_EXPORT int XkbLatchModifiers(
+extern int XkbLatchModifiers(
DeviceIntPtr /* pXDev */,
CARD8 /* mask */,
CARD8 /* latches */
);
-extern _X_EXPORT int XkbLatchGroup(
+extern int XkbLatchGroup(
DeviceIntPtr /* pXDev */,
int /* group */
);
-extern _X_EXPORT void XkbClearAllLatchesAndLocks(
+extern void XkbClearAllLatchesAndLocks(
DeviceIntPtr /* dev */,
XkbSrvInfoPtr /* xkbi */,
Bool /* genEv */,
XkbEventCausePtr /* cause */
);
-extern _X_EXPORT void XkbGetRulesDflts(
+extern void XkbGetRulesDflts(
XkbRMLVOSet * /* rmlvo */
);
@@ -833,19 +833,19 @@ extern _X_EXPORT void XkbFreeRMLVOSet(
Bool /* freeRMLVO */
);
-extern _X_EXPORT void XkbSetRulesDflts(
+extern void XkbSetRulesDflts(
XkbRMLVOSet * /* rmlvo */
);
-extern _X_EXPORT void XkbDeleteRulesDflts(
+extern void XkbDeleteRulesDflts(
void
);
-extern _X_EXPORT int SProcXkbDispatch(
+extern int SProcXkbDispatch(
ClientPtr /* client */
);
-extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(
+extern XkbGeometryPtr XkbLookupNamedGeometry(
DeviceIntPtr /* dev */,
Atom /* name */,
Bool * /* shouldFree */
@@ -857,14 +857,14 @@ extern _X_EXPORT void XkbConvertCase(
KeySym * /* upper */
);
-extern _X_EXPORT Status XkbChangeKeycodeRange(
+extern Status XkbChangeKeycodeRange(
XkbDescPtr /* xkb */,
int /* minKC */,
int /* maxKC */,
XkbChangesPtr /* changes */
);
-extern _X_EXPORT void XkbFreeSrvLedInfo(
+extern void XkbFreeSrvLedInfo(
XkbSrvLedInfoPtr /* sli */
);
@@ -890,19 +890,19 @@ extern _X_EXPORT int XkbKeyTypesForCoreSymbols(
KeySym * /* xkb_syms_rtrn */
);
-extern _X_EXPORT Bool XkbApplyCompatMapToKey(
+extern Bool XkbApplyCompatMapToKey(
XkbDescPtr /* xkb */,
KeyCode /* key */,
XkbChangesPtr /* changes */
);
-extern _X_EXPORT Bool XkbApplyVirtualModChanges(
+extern Bool XkbApplyVirtualModChanges(
XkbDescPtr /* xkb */,
unsigned int /* changed */,
XkbChangesPtr /* changes */
);
-extern _X_EXPORT void XkbSendNewKeyboardNotify(
+extern void XkbSendNewKeyboardNotify(
DeviceIntPtr /* kbd */,
xkbNewKeyboardNotify * /* pNKN */
);
@@ -956,13 +956,13 @@ typedef struct _XkbSrvListInfo {
int nFound[_XkbListNumComponents];
} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
-extern _X_EXPORT Status XkbDDXList(
+extern Status XkbDDXList(
DeviceIntPtr /* dev */,
XkbSrvListInfoPtr /* listing */,
ClientPtr /* client */
);
-extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(
+extern unsigned int XkbDDXLoadKeymapByNames(
DeviceIntPtr /* keybd */,
XkbComponentNamesPtr /* names */,
unsigned int /* want */,
@@ -972,7 +972,7 @@ extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(
int /* keymapNameRtrnLen */
);
-extern _X_EXPORT Bool XkbDDXNamesFromRules(
+extern Bool XkbDDXNamesFromRules(
DeviceIntPtr /* keybd */,
char * /* rules */,
XkbRF_VarDefsPtr /* defs */,
--
1.7.7.3
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
