From 8595eca7d51f3d1b0d205c117fdb1dc7ea14f765 Mon Sep 17 00:00:00 2001 From: sabetts Date: Sat, 26 Jan 2002 23:51:54 +0000 Subject: (alias_t): rename data structure from cmd_alias to avoid a name clash with the function cmd_alias. Dependant code updated. --- ChangeLog | 4 ++++ src/actions.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d22578f..87c9ae5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-01-26 shawn + * src/actions.c (alias_t): rename data structure from cmd_alias to + avoid a name clash with the function cmd_alias. Dependant code + updated. + * src/list.c (set_active_window): Corrected a bug in determining what a maxsize window is. Only one of width or height must be less than the screen width or height for a window to qualify as a diff --git a/src/actions.c b/src/actions.c index b7f7a19..e0d4188 100644 --- a/src/actions.c +++ b/src/actions.c @@ -117,13 +117,13 @@ static user_command user_commands[] = #endif {0, 0, 0} }; -struct cmd_alias +typedef struct { char *name; char *alias; -}; +} alias_t; -static struct cmd_alias *alias_list; +static alias_t *alias_list; static int alias_list_size; static int alias_list_last; @@ -264,7 +264,7 @@ initialize_default_keybindings (void) /* Initialive the alias list. */ alias_list_size = 5; alias_list_last = 0; - alias_list = xmalloc (sizeof (cmd_alias) * alias_list_size); + alias_list = xmalloc (sizeof (alias_t) * alias_list_size); prefix_key.sym = KEY_PREFIX; prefix_key.state = MODIFIER_PREFIX; @@ -2415,7 +2415,7 @@ cmd_alias (int interactive, void *data) if (alias_list_last >= alias_list_size) { alias_list_size *= 2; - alias_list = xrealloc (alias_list, sizeof (cmd_alias) * alias_list_size); + alias_list = xrealloc (alias_list, sizeof (alias_t) * alias_list_size); } alias_list[alias_list_last].name = xstrdup (name); -- cgit v1.2.3