forked from github/server
removed warnings
This commit is contained in:
parent
6978b09a06
commit
40ef16c53f
3 changed files with 3 additions and 14 deletions
|
@ -214,18 +214,6 @@ gamedate2(const struct locale * lang)
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
|
||||||
gamedate_short(const struct locale * lang)
|
|
||||||
{
|
|
||||||
static char buf[256];
|
|
||||||
gamedate gd;
|
|
||||||
|
|
||||||
get_gamedate(turn, &gd);
|
|
||||||
sprintf(buf, "%d/%s/%d", gd.week+1, LOC(lang, monthnames[gd.month]), gd.year);
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
rpsnr(FILE * F, const char * s, int offset)
|
rpsnr(FILE * F, const char * s, int offset)
|
||||||
{
|
{
|
||||||
|
|
|
@ -88,7 +88,7 @@ xml_s(const char * str)
|
||||||
char * outbuf = buffer;
|
char * outbuf = buffer;
|
||||||
size_t inbytes = strlen(str)+1;
|
size_t inbytes = strlen(str)+1;
|
||||||
size_t outbytes = sizeof(buffer);
|
size_t outbytes = sizeof(buffer);
|
||||||
iconv(utf8, (const char**)&inbuf, &inbytes, (char**)&outbuf, &outbytes);
|
iconv(utf8, (char**)&inbuf, &inbytes, (char**)&outbuf, &outbytes);
|
||||||
return (xmlChar*)buffer;
|
return (xmlChar*)buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1095,6 +1095,7 @@ region_setowner(struct region * r, struct faction * owner)
|
||||||
#ifdef REGIONOWNERS
|
#ifdef REGIONOWNERS
|
||||||
r->owner = owner;
|
r->owner = owner;
|
||||||
#else
|
#else
|
||||||
unused(r, owner);
|
unused(r);
|
||||||
|
unused(owner);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue