From 259200777e6fddc24a0ae2914f4c78fecd301980 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 30 Dec 2020 17:04:12 +0100 Subject: [PATCH] include: Move sarg.c stuff to nsc.h to avoid incomplete enum Portability issue: prototypes.h uses enum ns_seltype, defined in nsc.h. GCC is fine with that; it supports incomplete enum types as an extension. Broken in commit 157ae8ec2 "Clean up superfluous include of nsc.h in prototypes.h", v4.3.27. Moving sarg.c stuff to nsc.h fixes it. Signed-off-by: Markus Armbruster --- include/nsc.h | 8 +++++++- include/prototypes.h | 6 +----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/nsc.h b/include/nsc.h index 3e173929f..554939643 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -28,7 +28,7 @@ * * Known contributors to this file: * Dave Pare, 1989 - * Markus Armbruster, 2004-2016 + * Markus Armbruster, 2004-2020 */ #ifndef NSC_H @@ -319,6 +319,12 @@ extern void nsc_init(void); extern int nxtitem(struct nstr_item *, void *); /* src/lib/subs/nxtsct.c */ extern int nxtsct(struct nstr_sect *, struct sctstr *); +/* src/lib/subs/sarg.c */ +extern enum ns_seltype sarg_type(char *); +extern int sarg_xy(char *, coord *, coord *); +extern int sarg_area(char *, struct range *); +extern int sarg_range(char *, coord *, coord *, int *); +extern int sarg_list(char *, int *, int); /* src/lib/subs/snxtitem.c */ extern int snxtitem(struct nstr_item *, int, char *, char *); extern void snxtitem_area(struct nstr_item *, int, struct range *); diff --git a/include/prototypes.h b/include/prototypes.h index 4c444c77e..a1d933da4 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -566,11 +566,7 @@ extern void rad_map_set(natid, int, int, int, double, int); /* retreat.c */ /* in retreat.h */ /* sarg.c */ -extern enum ns_seltype sarg_type(char *); -extern int sarg_xy(char *, coord *, coord *); -extern int sarg_area(char *, struct range *); -extern int sarg_range(char *, coord *, coord *, int *); -extern int sarg_list(char *, int *, int); +/* in nsc.h */ /* satmap.c */ extern void satdisp_sect(struct sctstr *, int); extern void satdisp_units(coord, coord); -- 2.43.0