From e30910131cf9a46821686dfdd02862d52950a1eb Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Mon, 12 Jun 2017 02:18:55 +0000
Subject: [PATCH] Move filelist_item_t struct to quakedef.h, instead of
 redefining it in console.c and host_cmd.c

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1411 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/console.c  | 11 -----------
 Quake/host_cmd.c |  8 --------
 Quake/quakedef.h | 10 ++++++++++
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Quake/console.c b/Quake/console.c
index c2aa4ac2..b9c516c3 100644
--- a/Quake/console.c
+++ b/Quake/console.c
@@ -806,17 +806,6 @@ void AddToTabList (const char *name, const char *type)
 	}
 }
 
-// This is redefined from host_cmd.c
-typedef struct filelist_item_s
-{
-	char			name[32];
-	struct filelist_item_s	*next;
-} filelist_item_t;
-
-extern filelist_item_t	*extralevels;
-extern filelist_item_t	*modlist;
-extern filelist_item_t	*demolist;
-
 typedef struct arg_completion_type_s
 {
 	const char		*command;
diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
index 969749a3..fad4bf81 100644
--- a/Quake/host_cmd.c
+++ b/Quake/host_cmd.c
@@ -55,14 +55,6 @@ void Host_Quit_f (void)
 //johnfitz -- extramaps management
 //==============================================================================
 
-// ericw -- was extralevel_t, renamed and now used with mods list as well
-// to simplify completion code
-typedef struct filelist_item_s
-{
-	char			name[32];
-	struct filelist_item_s	*next;
-} filelist_item_t;
-
 /*
 ==================
 FileList_Add
diff --git a/Quake/quakedef.h b/Quake/quakedef.h
index 22912fe7..c1910773 100644
--- a/Quake/quakedef.h
+++ b/Quake/quakedef.h
@@ -287,6 +287,16 @@ extern	int		host_framecount;	// incremented every frame, never reset
 extern	double		realtime;		// not bounded in any way, changed at
 							// start of every frame, never reset
 
+typedef struct filelist_item_s
+{
+	char			name[32];
+	struct filelist_item_s	*next;
+} filelist_item_t;
+
+extern filelist_item_t	*modlist;
+extern filelist_item_t	*extralevels;
+extern filelist_item_t	*demolist;
+
 void Host_ClearMemory (void);
 void Host_ServerFrame (void);
 void Host_InitCommands (void);