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

(fldoff): Use offsetof() instead. Rest of struct.h is unused, remove.

Browse source
This commit is contained in:
Markus Armbruster 2004-09-10 18:41:58 +00:00
parent 65bb65f63d
commit 7d34832100
3 changed files with 4 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/global/nsc.c
View file

@ -32,7 +32,7 @@
*
*/
#include <struct.h>
#include <stddef.h>
#include "misc.h"
#include "var.h"
#include "xy.h"
@ -52,6 +52,8 @@
#include "commodity.h"
#include "lost.h"
#define fldoff(str, fld) offsetof(struct str, fld)
#define NSC_IELT(name, pfx, sfx, base, itype) \
{NSC_SHORT, 0, 0, ((base) + (itype)*sizeof(u_short)), \
sizeof(sfx) == 1 ? name : pfx sfx}
@ -84,9 +86,9 @@ struct castr sect_ca[] = {
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(sctstr, sct_terr), "terr0"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr1), "terr1"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr2), "terr2"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr3), "terr3"},
{NSC_XCOORD, 0, 0, fldoff(sctstr, sct_dist_x), "xdist"},
{NSC_YCOORD, 0, 0, fldoff(sctstr, sct_dist_y), "ydist"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr3), "terr3"},
{NSC_SHORT, 0, 0, fldoff(sctstr, sct_avail), "avail"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_work), "work"},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_coastal), "coastal"},