(att_mode, xyas, ownxy, prbuf): Get rid of s_char. Users changed.
(ATTRIBUTE): Don't disable use of gcc __attribute__ when s_char is signed char. All format strings are now char *.
This commit is contained in:
parent
24a07cd249
commit
686eadad37
5 changed files with 10 additions and 13 deletions
|
@ -49,7 +49,7 @@
|
|||
* return pointer to a string containing the x,y
|
||||
* coords as desired by a particular target country.
|
||||
*/
|
||||
s_char *
|
||||
char *
|
||||
xyas(coord x, coord y, natid country)
|
||||
{
|
||||
struct natstr *np;
|
||||
|
@ -58,7 +58,7 @@ xyas(coord x, coord y, natid country)
|
|||
return prbuf("%d,%d", xrel(np, x), yrel(np, y));
|
||||
}
|
||||
|
||||
s_char *
|
||||
char *
|
||||
ownxy(struct sctstr *sp)
|
||||
{
|
||||
return xyas(sp->sct_x, sp->sct_y, sp->sct_own);
|
||||
|
@ -223,11 +223,11 @@ xyinrange(coord x, coord y, struct range *rp)
|
|||
}
|
||||
|
||||
|
||||
s_char *
|
||||
prbuf(s_char *format, ...)
|
||||
char *
|
||||
prbuf(char *format, ...)
|
||||
{
|
||||
static int nbuf = -1;
|
||||
static s_char buf[20][1024];
|
||||
static char buf[20][1024];
|
||||
va_list ap;
|
||||
|
||||
if (++nbuf > 19)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue