diff options
| author | Ozkan Sezer <sezeroz@gmail.com> | 2020-11-11 12:33:55 +0300 |
|---|---|---|
| committer | Ozkan Sezer <sezeroz@gmail.com> | 2020-11-11 12:33:55 +0300 |
| commit | 7d50021ec2befda6cabc781f6694211f1d31e6c4 (patch) | |
| tree | 770cd8927a69e1a1fc20fba98d154ac9e9a6fdee /src/audio/SDL_wave.c | |
| parent | c8993eb223046eea43a0a2838d024d1719952e4d (diff) | |
| download | sdl-7d50021ec2befda6cabc781f6694211f1d31e6c4.tar.gz | |
SIZE_MAX need not be defined in limits.h
it can be in limits.h (windows) or stdint.h.
Diffstat (limited to 'src/audio/SDL_wave.c')
| -rw-r--r-- | src/audio/SDL_wave.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c index 0eec7bf43..a7d644a6e 100644 --- a/src/audio/SDL_wave.c +++ b/src/audio/SDL_wave.c @@ -22,14 +22,13 @@ #ifdef HAVE_LIMITS_H #include <limits.h> -#else -#ifndef SIZE_MAX -#define SIZE_MAX ((size_t)-1) #endif #ifndef INT_MAX /* Make a lucky guess. */ #define INT_MAX SDL_MAX_SINT32 #endif +#ifndef SIZE_MAX +#define SIZE_MAX ((size_t)-1) #endif /* Microsoft WAVE file loading routines */ @@ -928,7 +927,7 @@ IMA_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state) { Sint16 step; Uint32 c; - Uint8 *cstate = state->cstate; + Uint8 *cstate = (Uint8 *) state->cstate; for (c = 0; c < state->channels; c++) { size_t o = state->block.pos + c * 4; @@ -1561,7 +1560,7 @@ WaveReadPartialChunkData(SDL_RWops *src, WaveChunk *chunk, size_t length) } if (length > 0) { - chunk->data = SDL_malloc(length); + chunk->data = (Uint8 *) SDL_malloc(length); if (chunk->data == NULL) { return SDL_OutOfMemory(); } |