Commit b41c77f8a809e3d7747b7fcbb4d3c5e9b6a1a149
2012-05-07T14:54:12
Revert "Unconstify xkb_rules_names" This reverts commit d007cd0a1f3f4b9c927175771ff79aae6fe4ab8b. This is in fact more restrictive, because it breaks the (common) case where the strings are const themselved, e.g. "evdev", "us", etc. As is you must either duplicate the strings or suppress the warnings. If the user needs to retain the non-const strings, he should instead just keep them in some other struct and use xkb_rules_names just as a temporary parameter for xkb_map_new_from_names. Mildly annoying but acceptable.
diff --git a/include/xkbcommon/xkbcommon.h b/include/xkbcommon/xkbcommon.h
index 4eeaaca..4ab9e03 100644
--- a/include/xkbcommon/xkbcommon.h
+++ b/include/xkbcommon/xkbcommon.h
@@ -111,11 +111,11 @@ typedef uint32_t xkb_led_index_t;
* should be the primary identifier for a keymap.
*/
struct xkb_rule_names {
- char *rules;
- char *model;
- char *layout;
- char *variant;
- char *options;
+ const char *rules;
+ const char *model;
+ const char *layout;
+ const char *variant;
+ const char *options;
};
/**