From 53b166797da547b11a473993ff912ee167766e95 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 11 Nov 2020 12:33:55 +0300 Subject: [PATCH] SIZE_MAX need not be defined in limits.h it can be in limits.h (windows) or stdint.h. --- src/audio/SDL_wave.c | 9 ++++----- src/video/windows/SDL_windowsmessagebox.c | 3 +-- 2 files changed, 5 insertions(+), 7 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 -#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(); } diff --git a/src/video/windows/SDL_windowsmessagebox.c b/src/video/windows/SDL_windowsmessagebox.c index b40c974f3..73b180cbe 100644 --- a/src/video/windows/SDL_windowsmessagebox.c +++ b/src/video/windows/SDL_windowsmessagebox.c @@ -24,11 +24,10 @@ #ifdef HAVE_LIMITS_H #include -#else +#endif #ifndef SIZE_MAX #define SIZE_MAX ((size_t)-1) #endif -#endif #include "../../core/windows/SDL_windows.h"