diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-07-18 16:27:57 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:56 +1100 |
| commit | 133e0bd6f1cc147a2ddbbe1519d10300e7dbe669 (patch) | |
| tree | b58d395b127071188a4fcc983a9ef1274d5e778f /include | |
| parent | cc5c6d628aa0dc87c2cc9d063972e09ad747a596 (diff) | |
XKB: Remove 'extra' functionality from rules parsing
When we find something weird in the rules, don't stash it as an extra
freeform component, just state that the rules file is likely broken and
move on with our lives.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xkbrules.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/include/xkbrules.h b/include/xkbrules.h index e8917f076..0001481cd 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -42,10 +42,6 @@ typedef struct _XkbRF_VarDefs { char * layout; char * variant; char * options; - unsigned short sz_extra; - unsigned short num_extra; - char * extra_names; - char ** extra_values; } XkbRF_VarDefsRec,*XkbRF_VarDefsPtr; typedef struct _XkbRF_VarDesc { @@ -94,10 +90,6 @@ typedef struct _XkbRF_Rules { XkbRF_DescribeVarsRec layouts; XkbRF_DescribeVarsRec variants; XkbRF_DescribeVarsRec options; - unsigned short sz_extra; - unsigned short num_extra; - char ** extra_names; - XkbRF_DescribeVarsPtr extra; unsigned short sz_rules; unsigned short num_rules; @@ -148,11 +140,6 @@ extern _X_EXPORT XkbRF_VarDescPtr XkbRF_AddVarDescCopy( XkbRF_VarDescPtr /* copy_from */ ); -extern _X_EXPORT XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( - XkbRF_RulesPtr /* rules */, - char * /* name */ -); - extern _X_EXPORT Bool XkbRF_LoadDescriptions( FILE * /* file */, XkbRF_RulesPtr /* rules */ @@ -171,10 +158,7 @@ extern _X_EXPORT XkbRF_RulesPtr XkbRF_Load( Bool /* wantRules */ ); -extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create( - int /* sz_rules */, - int /* sz_extra */ -); +extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create(void); /***====================================================================***/ |