diff --git a/src/files.c b/src/files.c index 75495c3f8..57f02d8e1 100644 --- a/src/files.c +++ b/src/files.c @@ -45,7 +45,7 @@ extern int errno; #include #endif -#if defined(UNIX) || defined(VMS) +#if defined(UNIX) || defined(VMS) || defined(_MSC_VER) #include #endif diff --git a/src/mail.c b/src/mail.c index 05bc424d6..388f1e5ac 100644 --- a/src/mail.c +++ b/src/mail.c @@ -440,7 +440,7 @@ struct obj *otmp; /* XXX replace with more general substitution code and add local * contact message. Also use DEVTEAM_URL */ - if(junk[0]) == NULL){ + if(junk[0] == NULL){ #define BUGS_FORMAT "Report bugs to %s." junk[0] = (char *)alloc(strlen(BUGS_FORMAT) + strlen(DEVTEAM_EMAIL)); sprintf(junk[0], DEVTEAM_EMAIL); diff --git a/src/trap.c b/src/trap.c index 392c486d3..8d62c4868 100644 --- a/src/trap.c +++ b/src/trap.c @@ -2399,7 +2399,7 @@ glovecheck: target = which_armor(mtmp, W_ARMG); if (in_sight) seetrap(trap); if ((mtmp->mhp -= dmgval2) <= 0) monkilled(mtmp, in_sight ? - "compression from an anti-magic field" : 0, + "compression from an anti-magic field" : (const char *)0, -AD_MAGM); if (mtmp->mhp <= 0) trapkilled = TRUE; if (see_it) newsym(trap->tx, trap->ty); diff --git a/win/share/tile.h b/win/share/tile.h index 4dd763344..e785ddaed 100644 --- a/win/share/tile.h +++ b/win/share/tile.h @@ -1,6 +1,6 @@ typedef unsigned char pixval; -typedef struct { +typedef struct pixel_t { pixval r, g, b; } pixel;