From 2738f137985254371dab279f6063164fbb42e8e0 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 8 Oct 2012 13:26:24 +0200 Subject: [PATCH] move owindow definition into the command parser --- include/commands.h | 12 ------------ src/commands.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/commands.h b/include/commands.h index 6d195a09..5da9fc07 100644 --- a/include/commands.h +++ b/include/commands.h @@ -15,18 +15,6 @@ /** The beginning of the prototype for every cmd_ function. */ #define I3_CMD Match *current_match, struct CommandResult *cmd_output -/* - * Helper data structure for an operation window (window on which the operation - * will be performed). Used to build the TAILQ owindows. - * - */ -typedef struct owindow { - Con *con; - TAILQ_ENTRY(owindow) owindows; -} owindow; - -typedef TAILQ_HEAD(owindows_head, owindow) owindows_head; - /** * Initializes the specified 'Match' data structure and the initial state of * commands.c for matching target windows of a command. diff --git a/src/commands.c b/src/commands.c index 53532435..e323a6ec 100644 --- a/src/commands.c +++ b/src/commands.c @@ -38,7 +38,6 @@ } \ } while (0) -static owindows_head owindows; /* * Returns true if a is definitely greater than b (using the given epsilon) @@ -222,6 +221,20 @@ void cmd_MIGRATION_start_nagbar(void) { * Criteria functions. ******************************************************************************/ +/* + * Helper data structure for an operation window (window on which the operation + * will be performed). Used to build the TAILQ owindows. + * + */ +typedef struct owindow { + Con *con; + TAILQ_ENTRY(owindow) owindows; +} owindow; + +typedef TAILQ_HEAD(owindows_head, owindow) owindows_head; + +static owindows_head owindows; + /* * Initializes the specified 'Match' data structure and the initial state of * commands.c for matching target windows of a command.