empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include: Move sarg.c stuff to nsc.h to avoid incomplete enum

Browse source 
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 <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-12-30 17:04:12 +01:00
parent a0d1f63729
commit c48abacad2
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/nsc.h
View file

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Dave Pare, 1989 * Dave Pare, 1989
* Markus Armbruster, 2004-2016 * Markus Armbruster, 2004-2020
*/ */
#ifndef NSC_H #ifndef NSC_H
@ -319,6 +319,12 @@ extern void nsc_init(void);
extern int nxtitem(struct nstr_item *, void *); extern int nxtitem(struct nstr_item *, void *);
/* src/lib/subs/nxtsct.c */ /* src/lib/subs/nxtsct.c */
extern int nxtsct(struct nstr_sect *, struct sctstr *); 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 */ /* src/lib/subs/snxtitem.c */
extern int snxtitem(struct nstr_item *, int, char *, char *); extern int snxtitem(struct nstr_item *, int, char *, char *);
extern void snxtitem_area(struct nstr_item *, int, struct range *); extern void snxtitem_area(struct nstr_item *, int, struct range *);

6
include/prototypes.h
View file

@ -566,11 +566,7 @@ extern void rad_map_set(natid, int, int, int, double, int);
/* retreat.c */ /* retreat.c */
/* in retreat.h */ /* in retreat.h */
/* sarg.c */ /* sarg.c */
extern enum ns_seltype sarg_type(char *); /* in nsc.h */
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);
/* satmap.c */ /* satmap.c */
extern void satdisp_sect(struct sctstr *, int); extern void satdisp_sect(struct sctstr *, int);
extern void satdisp_units(coord, coord); extern void satdisp_units(coord, coord);