From 577612258ac62900e91c312cb6ee62db0dc0ed81 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 7 Nov 2012 00:41:06 +0200 Subject: [PATCH] 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 --- xkbcommon/xkbcommon.h | 16 ++++++++-------- 1 file 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 @@ -342,7 +342,7 @@ 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) }; /** @@ -407,7 +407,7 @@ 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) }; /** @@ -560,7 +560,7 @@ enum xkb_log_level { 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. */ }; /** @@ -656,7 +656,7 @@ 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 }; /** @@ -686,7 +686,7 @@ xkb_keymap_new_from_names(struct xkb_context *context, /** 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 }; /** @@ -1020,7 +1020,7 @@ 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. */ }; /** @@ -1054,7 +1054,7 @@ enum xkb_state_component { * (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) }; /** @@ -1170,7 +1170,7 @@ enum xkb_state_match { 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) }; /**