move owindow definition into the command parser

diff --git a/include/commands.h b/include/commands.h
index 6d195a092473cc1c7cd5f75d7ab0eca2aa24dea2..5da9fc07161bc7a591a706798faa7ca35c892fe6 100644 (file)
--- 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 535324359dddc5703c80a13767ff9b54b8de7ddc..e323a6eccdd191a3e006f1a9e90fc9b59a0a9332 100644 (file)
--- 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.