nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Microsoft compiler warning building tile2bmp.c

Browse Source 
..\win\share\tile2bmp.c(234): warning C4366: The result of the unary '&'
operator may be unaligned
This commit is contained in:
nhmall
2021-06-08 14:38:47 -04:00
parent ca7b1d5df0
commit 710efe4175
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
win/share/tile2bmp.c
View File

@@ -36,6 +36,12 @@ extern void objects_globals_init(void);
# endif # endif
#endif #endif
#ifdef _MSC_VER
#define UNALIGNED_POINTER __unaligned
#else
#define UNALIGNED_POINTER
#endif
#if (TILE_X == 32) #if (TILE_X == 32)
#define COLORS_IN_USE 256 #define COLORS_IN_USE 256
#else #else
@@ -159,7 +165,7 @@ FILE *tibfile2;
pixel tilepixels[TILE_Y][TILE_X]; pixel tilepixels[TILE_Y][TILE_X];
static void build_bmfh(BITMAPFILEHEADER *); static void build_bmfh(BITMAPFILEHEADER *);
static void build_bmih(BITMAPINFOHEADER *); static void build_bmih(UNALIGNED_POINTER BITMAPINFOHEADER *);
static void build_bmptile(pixel(*) [TILE_X]); static void build_bmptile(pixel(*) [TILE_X]);
const char *tilefiles[] = { const char *tilefiles[] = {
@@ -230,8 +236,11 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!initflag) { if (!initflag) {
UNALIGNED_POINTER BITMAPINFOHEADER *bmih;
build_bmfh(&bmp.bmfh); build_bmfh(&bmp.bmfh);
build_bmih(&bmp.bmih); bmih = &bmp.bmih;
build_bmih(bmih);
for (i = 0; i < MAX_Y; ++i) for (i = 0; i < MAX_Y; ++i)
for (j = 0; j < MAX_X; ++j) for (j = 0; j < MAX_X; ++j)
bmp.packtile[i][j] = (uchar) 0; bmp.packtile[i][j] = (uchar) 0;
@@ -284,7 +293,7 @@ build_bmfh(BITMAPFILEHEADER* pbmfh)
} }
static void static void
build_bmih(BITMAPINFOHEADER* pbmih) build_bmih(UNALIGNED_POINTER BITMAPINFOHEADER* pbmih)
{ {
WORD cClrBits; WORD cClrBits;
int w, h; int w, h;