History

Fix compile with MinGW64 7.3 & MSVC 2017

BogDan Vatra committed 7 years ago

Commit ce65c491 parent 43caa381 file · +4 −3Browse files

Unified · Split

minimp3_ex.h+4−3
@@ -277,6 +277,7 @@ static int mp3dec_open_file(const char *file_name, mp3dec_map_info_t *map_info) · 276 unmodified lines
277277 {
278278 memset(map_info, 0, sizeof(*map_info));
279279
280+ HANDLE mapping = NULL;
280281 HANDLE file = CreateFileA(file_name, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
281282 if (INVALID_HANDLE_VALUE == file)
282283 return -1;
@@ -286,10 +287,10 @@ static int mp3dec_open_file(const char *file_name, mp3dec_map_info_t *map_info) · 3 unmodified lines
286287 goto error;
287288 map_info->size = s.QuadPart;
288289
289− HANDLE mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
290+ mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL);
290291 if (!mapping)
291292 goto error;
292− map_info->buffer = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, s.QuadPart);
293+ map_info->buffer = (const uint8_t*) MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, s.QuadPart);
293294 CloseHandle(mapping);
294295 if (!map_info->buffer)
295296 goto error;
@@ -386,7 +387,7 @@ int mp3dec_ex_open(mp3dec_ex_t *dec, const char *file_name, int seek_method) · 90 unmodified lines
386387 #else
387388 void mp3dec_ex_close(mp3dec_ex_t *dec)
388389 {
389− free(dec->file.buffer);
390+ free((void*)dec->file.buffer);
390391 memset(dec, 0, sizeof(*dec));
391392 }
392393 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t