From bf716b947a113056d315ee75802e40c6a5df3d65 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 11 Apr 2017 21:41:53 -0700
Subject: [PATCH] Util: Move StringList to string.c

---
 include/mgba-util/vector.h | 2 ++
 include/mgba/core/cheats.h | 1 -
 src/core/cheats.c          | 1 -
 src/util/string.c          | 4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/mgba-util/vector.h b/include/mgba-util/vector.h
index 664221b7d..ae542d41b 100644
--- a/include/mgba-util/vector.h
+++ b/include/mgba-util/vector.h
@@ -92,6 +92,8 @@ CXX_GUARD_START
 		dest->size = src->size; \
 	} \
 
+DECLARE_VECTOR(StringList, char*);
+
 CXX_GUARD_END
 
 #endif
diff --git a/include/mgba/core/cheats.h b/include/mgba/core/cheats.h
index 7960ae58b..25ad3bbe1 100644
--- a/include/mgba/core/cheats.h
+++ b/include/mgba/core/cheats.h
@@ -48,7 +48,6 @@ struct mCheat {
 mLOG_DECLARE_CATEGORY(CHEATS);
 
 DECLARE_VECTOR(mCheatList, struct mCheat);
-DECLARE_VECTOR(StringList, char*);
 
 struct mCheatDevice;
 struct mCheatSet {
diff --git a/src/core/cheats.c b/src/core/cheats.c
index 83bdde0b8..5085a3d67 100644
--- a/src/core/cheats.c
+++ b/src/core/cheats.c
@@ -17,7 +17,6 @@ mLOG_DEFINE_CATEGORY(CHEATS, "Cheats", "core.cheats");
 
 DEFINE_VECTOR(mCheatList, struct mCheat);
 DEFINE_VECTOR(mCheatSets, struct mCheatSet*);
-DEFINE_VECTOR(StringList, char*);
 
 static int32_t _readMem(struct mCore* core, uint32_t address, int width) {
 	switch (width) {
diff --git a/src/util/string.c b/src/util/string.c
index a776bc16d..cef28e5cd 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -5,8 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include <mgba-util/string.h>
 
+#include <mgba-util/vector.h>
+
 #include <string.h>
 
+DEFINE_VECTOR(StringList, char*);
+
 #ifndef HAVE_STRNDUP
 char* strndup(const char* start, size_t len) {
 	// This is suboptimal, but anything recent should have strndup