diff --git a/version.c b/version.c index 7a48a5f..9e49559 100644 --- a/version.c +++ b/version.c @@ -40,22 +40,22 @@ uint32_t MsiGetFileVersionW(const char16_t *filename, unsigned char *map = (unsigned char *)mapv; #define BYTE(offset) ({ \ - size_t _offset = (offset); \ - if (_offset >= fsize) goto cleanup; /* outside file bounds */ \ - map[_offset]; \ + size_t _boffset = (offset); \ + if (_boffset >= fsize) goto cleanup; /* outside file bounds */ \ + map[_boffset]; \ }) #define WORD16(offset) ({ \ - size_t _offset = (offset); \ - uint16_t toret = BYTE(_offset+1); \ - toret = (toret << 8) | BYTE(_offset+0); \ + size_t _woffset = (offset); \ + uint16_t toret = BYTE(_woffset+1); \ + toret = (toret << 8) | BYTE(_woffset+0); \ toret; \ }) #define WORD32(offset) ({ \ - size_t _offset = (offset); \ - uint16_t toret = BYTE(_offset+3); \ - toret = (toret << 8) | BYTE(_offset+2); \ - toret = (toret << 8) | BYTE(_offset+1); \ - toret = (toret << 8) | BYTE(_offset+0); \ + size_t _doffset = (offset); \ + uint32_t toret = BYTE(_doffset+3); \ + toret = (toret << 8) | BYTE(_doffset+2); \ + toret = (toret << 8) | BYTE(_doffset+1); \ + toret = (toret << 8) | BYTE(_doffset+0); \ toret; \ })