Merge branch 'readline'

[empserver] / include / prototypes.h

diff --git a/include/prototypes.h b/include/prototypes.h
index 79b96ce639f571f48a810be572c1c78ee514841a..ec89b40df09d2435bf357e2bd653a8331e9735d7 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -59,7 +59,6 @@ extern int edit_sect_i(struct sctstr *, char *, int);
 extern int load_comm_ok(struct sctstr *, natid, i_type, int);
 extern void gift(natid, natid, void *, char *);
 extern int display_mark(i_type, int);
-extern int count_pop(int);
 extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
 extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
 extern char *prsub(struct shpstr *);
@@ -286,8 +285,7 @@ extern int demandupdatecheck(void);
 /* disassoc.c */
 extern int disassoc(void);
 /* fnameat.c */
-extern char *fnameat(const char *, const char *);
-extern FILE *fopenat(const char *, const char *, const char *);
+/* in fnameat.h */
 /* fsize.c */
 extern int fsize(int);
 extern int blksize(int);
@@ -400,6 +398,7 @@ extern int check_trade_ok(struct trdstr *);
 /* coastal.c */
 extern void set_coastal(struct sctstr *, int, int);
 /* control.c */
+extern double security_strength(struct sctstr *, int *);
 extern int military_control(struct sctstr *);
 extern int abandon_askyn(struct sctstr *, i_type, int, struct ulist *);
 extern int would_abandon(struct sctstr *, i_type, int, struct ulist *);
@@ -563,9 +562,7 @@ extern int delty(struct range *, coord);
 extern void radmap(int, int, int, double, int, double);
 extern void rad_map_set(natid, int, int, int, double, int);
 /* rej.c */
-extern void setrel(natid, natid, int);
-extern void setcont(natid, natid, int);
-extern void setrej(natid, natid, int, int);
+/* in nat.h */
 /* retreat.c */
 /* in retreat.h */
 /* sarg.c */