From d78df0b48b4e89bea621bf653b19444a57806e39 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 9 Apr 2011 09:28:58 +0200
Subject: [PATCH] Move function declarations for maps.c from prototypes.h to
 map.h

---
 include/map.h           | 6 ++++++
 include/prototypes.h    | 6 +-----
 src/lib/commands/move.c | 1 +
 src/lib/commands/shar.c | 1 +
 src/lib/commands/tran.c | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/map.h b/include/map.h
index 5497923a..d8e83c6d 100644
--- a/include/map.h
+++ b/include/map.h
@@ -59,5 +59,11 @@ extern void writemap(natid);
 /* src/lib/subs/border.c */
 extern void blankfill(char *, struct range *, int);
 extern void border(struct range *, char *, char *);
+/* src/lib/subs/maps.c */
+extern int do_map(int bmap, int unit_type, char *arg1, char *arg2);
+extern int display_region_map(int bmap, int unit_type, coord curx,
+			      coord cury, char *arg);
+extern int bmaps_intersect(natid, natid);
+extern int share_bmap(natid, natid, struct nstr_sect *, char, char *);
 
 #endif
diff --git a/include/prototypes.h b/include/prototypes.h
index 3619b5c4..f828325b 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -449,11 +449,7 @@ extern int has_units(coord, coord, natid, struct lndstr *);
 extern int adj_units(coord, coord, natid);
 extern int islist(char *);
 /* maps.c */
-extern int do_map(int bmap, int unit_type, char *arg1, char *arg2);
-extern int display_region_map(int bmap, int unit_type, coord curx,
-			      coord cury, char *arg);
-extern int bmaps_intersect(natid, natid);
-extern int share_bmap(natid, natid, struct nstr_sect *, char, char *);
+/* in map.h */
 /* mission.c */
 extern char *mission_name(int);
 extern int collateral_damage(coord, coord, int);
diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index ac872f12..4ffde824 100644
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -35,6 +35,7 @@
 #include "commands.h"
 #include "item.h"
 #include "land.h"
+#include "map.h"
 #include "optlist.h"
 #include "path.h"
 #include "plague.h"
diff --git a/src/lib/commands/shar.c b/src/lib/commands/shar.c
index 1e091c6b..d1885964 100644
--- a/src/lib/commands/shar.c
+++ b/src/lib/commands/shar.c
@@ -33,6 +33,7 @@
 #include <config.h>
 
 #include "commands.h"
+#include "map.h"
 
 int
 shar(void)
diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c
index 6b1e67f6..991eb23a 100644
--- a/src/lib/commands/tran.c
+++ b/src/lib/commands/tran.c
@@ -35,6 +35,7 @@
 
 #include "commands.h"
 #include "land.h"
+#include "map.h"
 #include "nuke.h"
 #include "plane.h"
 #include "ship.h"