summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2012-11-07 00:41:06 +0200
committerRan Benita <ran234@gmail.com>2012-11-07 18:59:41 +0200
commit577612258ac62900e91c312cb6ee62db0dc0ed81 (patch)
treee52cd9dab609f1dfab2b5f81ce592b2c49a0ebc6
parentd87035adacbe6ff5a857f33b61828d5c5248d6a9 (diff)
Don't use trailing enum comma in public headers
Pretty annoying, but C89 doesn't support that (officially), and it might cause warning with -pedantic, etc. (though you need -Wsystem-headers to see them usually). Removing them is not a big deal. Signed-off-by: Ran Benita <ran234@gmail.com>
-rw-r--r--xkbcommon/xkbcommon.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/xkbcommon/xkbcommon.h b/xkbcommon/xkbcommon.h
index 4e0abc4..43f9df1 100644
--- a/xkbcommon/xkbcommon.h
+++ b/xkbcommon/xkbcommon.h
@@ -339,13 +339,13 @@ struct xkb_rule_names {
int
xkb_keysym_get_name(xkb_keysym_t keysym, char *buffer, size_t size);
/** Flags for xkb_keysym_from_name(). */
enum xkb_keysym_flags {
/** Find keysym by case-insensitive search. */
- XKB_KEYSYM_CASE_INSENSITIVE = (1 << 0),
+ XKB_KEYSYM_CASE_INSENSITIVE = (1 << 0)
};
/**
* Get a keysym from its name.
*
* @param name The name of a keysym. See remarks in xkb_keysym_get_name();
@@ -404,13 +404,13 @@ xkb_keysym_to_utf32(xkb_keysym_t keysym);
* @{
*/
/** Flags for context creation. */
enum xkb_context_flags {
/** Create this context with an empty include path. */
- XKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0),
+ XKB_CONTEXT_NO_DEFAULT_INCLUDES = (1 << 0)
};
/**
* Create a new context.
*
* @param flags Optional flags for the context, or 0.
@@ -557,13 +557,13 @@ xkb_context_include_path_get(struct xkb_context *context, unsigned int index);
/** Specifies a logging level. */
enum xkb_log_level {
XKB_LOG_LEVEL_CRITICAL = 10, /**< Log critical internal errors only. */
XKB_LOG_LEVEL_ERROR = 20, /**< Log all errors. */
XKB_LOG_LEVEL_WARNING = 30, /**< Log warnings and errors. */
XKB_LOG_LEVEL_INFO = 40, /**< Log information, warnings, and errors. */
- XKB_LOG_LEVEL_DEBUG = 50, /**< Log everything. */
+ XKB_LOG_LEVEL_DEBUG = 50 /**< Log everything. */
};
/**
* Set the current logging level.
*
* @param context The context in which to set the logging level.
@@ -653,13 +653,13 @@ xkb_context_set_log_fn(struct xkb_context *context,
* @{
*/
/** Flags for keymap compilation. */
enum xkb_keymap_compile_flags {
/** Apparently you can't have empty enums. What a drag. */
- XKB_MAP_COMPILE_PLACEHOLDER = 0,
+ XKB_MAP_COMPILE_PLACEHOLDER = 0
};
/**
* Create a keymap from RMLVO names.
*
* The primary keymap entry point: creates a new XKB keymap from a set of
@@ -683,13 +683,13 @@ xkb_keymap_new_from_names(struct xkb_context *context,
const struct xkb_rule_names *names,
enum xkb_keymap_compile_flags flags);
/** The possible keymap text formats. */
enum xkb_keymap_format {
/** The current/classic XKB text format, as generated by xkbcomp -xkb. */
- XKB_KEYMAP_FORMAT_TEXT_V1 = 1,
+ XKB_KEYMAP_FORMAT_TEXT_V1 = 1
};
/**
* Create a keymap from a keymap file.
*
* @param context The context in which to create the keymap.
@@ -1017,13 +1017,13 @@ xkb_state_unref(struct xkb_state *state);
struct xkb_keymap *
xkb_state_get_keymap(struct xkb_state *state);
/** Specifies the direction of the key (press / release). */
enum xkb_key_direction {
XKB_KEY_UP, /**< The key was released. */
- XKB_KEY_DOWN, /**< The key was pressed. */
+ XKB_KEY_DOWN /**< The key was pressed. */
};
/**
* Modifier and layout types for state objects. This enum is bitmaskable,
* e.g. (XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED) is valid to
* exclude locked modifiers.
@@ -1051,13 +1051,13 @@ enum xkb_state_component {
* has been pressed again. */
XKB_STATE_LAYOUT_LOCKED = (1 << 6),
/** Effective layout, i.e. currently active and affects key processing
* (derived from the other state components). */
XKB_STATE_LAYOUT_EFFECTIVE = (1 << 7),
/** LEDs (derived from the other state components). */
- XKB_STATE_LEDS = (1 << 8),
+ XKB_STATE_LEDS = (1 << 8)
};
/**
* Update the keyboard state to reflect a given key being pressed or
* released.
*
@@ -1167,13 +1167,13 @@ enum xkb_state_match {
/** Returns true if any of the modifiers are active. */
XKB_STATE_MATCH_ANY = (1 << 0),
/** Returns true if all of the modifiers are active. */
XKB_STATE_MATCH_ALL = (1 << 1),
/** Makes matching non-exclusive, i.e. will not return false if a
* modifier not specified in the arguments is active. */
- XKB_STATE_MATCH_NON_EXCLUSIVE = (1 << 16),
+ XKB_STATE_MATCH_NON_EXCLUSIVE = (1 << 16)
};
/**
* Update a keyboard state from a set of explicit masks.
*
* This entrypoint is really only for window systems and the like, where a