aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/garray.h15
-rw-r--r--src/structs.h23
2 files changed, 18 insertions, 20 deletions
diff --git a/src/garray.h b/src/garray.h
index ff57ec957d..412a7f3ec3 100644
--- a/src/garray.h
+++ b/src/garray.h
@@ -1,6 +1,21 @@
#ifndef NEOVIM_GARRAY_H
#define NEOVIM_GARRAY_H
+/*
+ * Structure used for growing arrays.
+ * This is used to store information that only grows, is deleted all at
+ * once, and needs to be accessed by index. See ga_clear() and ga_grow().
+ */
+typedef struct growarray {
+ int ga_len; /* current number of items used */
+ int ga_maxlen; /* maximum number of items possible */
+ int ga_itemsize; /* sizeof(item) */
+ int ga_growsize; /* number of items to grow each time */
+ void *ga_data; /* pointer to the first item */
+} garray_T;
+
+#define GA_EMPTY {0, 0, 0, 0, NULL}
+
void ga_clear(garray_T *gap);
void ga_clear_strings(garray_T *gap);
void ga_init(garray_T *gap);
diff --git a/src/structs.h b/src/structs.h
index 3c0232e4f3..8fd1a64bf2 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -6,13 +6,11 @@
* Do ":help credits" in Vim to see a list of people who contributed.
*/
-/*
- * This file contains various definitions of structures that are used by Vim
- */
+// for garray_T
+#include "garray.h"
/*
- * There is something wrong in the SAS compiler that makes typedefs not
- * valid in include files. Has been fixed in version 6.58.
+ * This file contains various definitions of structures that are used by Vim
*/
/*
@@ -34,21 +32,6 @@ typedef struct {
colnr_T col; /* column number */
} lpos_T;
-/*
- * Structure used for growing arrays.
- * This is used to store information that only grows, is deleted all at
- * once, and needs to be accessed by index. See ga_clear() and ga_grow().
- */
-typedef struct growarray {
- int ga_len; /* current number of items used */
- int ga_maxlen; /* maximum number of items possible */
- int ga_itemsize; /* sizeof(item) */
- int ga_growsize; /* number of items to grow each time */
- void *ga_data; /* pointer to the first item */
-} garray_T;
-
-#define GA_EMPTY {0, 0, 0, 0, NULL}
-
typedef struct window_S win_T;
typedef struct wininfo_S wininfo_T;
typedef struct frame_S frame_T;