eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-17 18:28:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix warnings 'macro argument should be enclosed in parentheses'

Browse source
This commit is contained in:
Sylvain 2022-12-05 15:20:48 +01:00 • committed by Sam Lantinga
parent 8cafde5ecc
commit af5bda5ef3
10 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/audio/SDL_mixer.c
View file

@ -78,9 +78,9 @@ static const Uint8 mix8[] = {
}; };
/* The volume ranges from 0 - 128 */ /* The volume ranges from 0 - 128 */
#define ADJUST_VOLUME(s, v) (s = (s * v) / SDL_MIX_MAXVOLUME) #define ADJUST_VOLUME(s, v) ((s) = ((s) * (v)) / SDL_MIX_MAXVOLUME)
#define ADJUST_VOLUME_U8(s, v) (s = (((s - 128) * v) / SDL_MIX_MAXVOLUME) + 128) #define ADJUST_VOLUME_U8(s, v) ((s) = ((((s) - 128) * (v)) / SDL_MIX_MAXVOLUME) + 128)
#define ADJUST_VOLUME_U16(s, v) (s = (((s - 32768) * v) / SDL_MIX_MAXVOLUME) + 32768) #define ADJUST_VOLUME_U16(s, v) ((s) = ((((s) - 32768) * (v)) / SDL_MIX_MAXVOLUME) + 32768)
void SDL_MixAudioFormat(Uint8 *dst, const Uint8 *src, SDL_AudioFormat format, void SDL_MixAudioFormat(Uint8 *dst, const Uint8 *src, SDL_AudioFormat format,
Uint32 len, int volume) Uint32 len, int volume)

2
src/core/openbsd/SDL_wscons_kbd.c
View file

@ -41,7 +41,7 @@
#endif #endif
#define RETIFIOCTLERR(x) \ #define RETIFIOCTLERR(x) \
if (x == -1) { \ if ((x) == -1) { \
free(input); \ free(input); \
input = NULL; \ input = NULL; \
return NULL; \ return NULL; \

2
src/cpuinfo/SDL_cpuinfo.c
View file

@ -956,7 +956,7 @@ static Uint32 SDL_GetCPUFeatures(void)
return SDL_CPUFeatures; return SDL_CPUFeatures;
} }
#define CPU_FEATURE_AVAILABLE(f) ((SDL_GetCPUFeatures() & f) ? SDL_TRUE : SDL_FALSE) #define CPU_FEATURE_AVAILABLE(f) ((SDL_GetCPUFeatures() & (f)) ? SDL_TRUE : SDL_FALSE)
SDL_bool SDL_HasRDTSC(void) SDL_bool SDL_HasRDTSC(void)
{ {

22
src/render/SDL_render.c
View file

@ -45,13 +45,13 @@ this should probably be removed at some point in the future. --ryan. */
#define SDL_WINDOWRENDERDATA "_SDL_WindowRenderData" #define SDL_WINDOWRENDERDATA "_SDL_WindowRenderData"
#define CHECK_RENDERER_MAGIC(renderer, retval) \ #define CHECK_RENDERER_MAGIC(renderer, retval) \
if (!renderer || renderer->magic != &renderer_magic) { \ if (!(renderer) || (renderer)->magic != &renderer_magic) { \
SDL_InvalidParamError("renderer"); \ SDL_InvalidParamError("renderer"); \
return retval; \ return retval; \
} }
#define CHECK_TEXTURE_MAGIC(texture, retval) \ #define CHECK_TEXTURE_MAGIC(texture, retval) \
if (!texture || texture->magic != &texture_magic) { \ if (!(texture) || (texture)->magic != &texture_magic) { \
SDL_InvalidParamError("texture"); \ SDL_InvalidParamError("texture"); \
return retval; \ return retval; \
} }
@ -59,12 +59,12 @@ this should probably be removed at some point in the future. --ryan. */
/* Predefined blend modes */ /* Predefined blend modes */
#define SDL_COMPOSE_BLENDMODE(srcColorFactor, dstColorFactor, colorOperation, \ #define SDL_COMPOSE_BLENDMODE(srcColorFactor, dstColorFactor, colorOperation, \
srcAlphaFactor, dstAlphaFactor, alphaOperation) \ srcAlphaFactor, dstAlphaFactor, alphaOperation) \
(SDL_BlendMode)(((Uint32)colorOperation << 0) | \ (SDL_BlendMode)(((Uint32)(colorOperation) << 0) | \
((Uint32)srcColorFactor << 4) | \ ((Uint32)(srcColorFactor) << 4) | \
((Uint32)dstColorFactor << 8) | \ ((Uint32)(dstColorFactor) << 8) | \
((Uint32)alphaOperation << 16) | \ ((Uint32)(alphaOperation) << 16) | \
((Uint32)srcAlphaFactor << 20) | \ ((Uint32)(srcAlphaFactor) << 20) | \
((Uint32)dstAlphaFactor << 24)) ((Uint32)(dstAlphaFactor) << 24))
#define SDL_BLENDMODE_NONE_FULL \ #define SDL_BLENDMODE_NONE_FULL \
SDL_COMPOSE_BLENDMODE(SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ZERO, SDL_BLENDOPERATION_ADD, \ SDL_COMPOSE_BLENDMODE(SDL_BLENDFACTOR_ONE, SDL_BLENDFACTOR_ZERO, SDL_BLENDOPERATION_ADD, \
@ -3049,9 +3049,9 @@ int SDL_RenderDrawLinesF(SDL_Renderer *renderer,
*ptr_xy++ = q.y + scale_y; *ptr_xy++ = q.y + scale_y;
#define ADD_TRIANGLE(i1, i2, i3) \ #define ADD_TRIANGLE(i1, i2, i3) \
*ptr_indices++ = cur_index + i1; \ *ptr_indices++ = cur_index + (i1); \
*ptr_indices++ = cur_index + i2; \ *ptr_indices++ = cur_index + (i2); \
*ptr_indices++ = cur_index + i3; \ *ptr_indices++ = cur_index + (i3); \
num_indices += 3; num_indices += 3;
/* closed polyline, don´t draw twice the point */ /* closed polyline, don´t draw twice the point */

8
src/test/SDL_test_common.c
View file

@ -113,13 +113,13 @@ SDLTest_CommonCreateState(char **argv, Uint32 flags)
} }
#define SEARCHARG(dim) \ #define SEARCHARG(dim) \
while (*dim && *dim != ',') { \ while (*(dim) && *(dim) != ',') { \
++dim; \ ++(dim); \
} \ } \
if (!*dim) { \ if (!*(dim)) { \
return -1; \ return -1; \
} \ } \
*dim++ = '\0'; *(dim)++ = '\0';
int SDLTest_CommonArg(SDLTest_CommonState *state, int index) int SDLTest_CommonArg(SDLTest_CommonState *state, int index)
{ {

6
src/test/SDL_test_md5.c
View file

@ -67,10 +67,10 @@ static unsigned char MD5PADDING[64] = {
}; };
/* F, G, H and I are basic MD5 functions */ /* F, G, H and I are basic MD5 functions */
#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) #define F(x, y, z) (((x) & (y)) | ((~(x)) & (z)))
#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) #define G(x, y, z) (((x) & (z)) | ((y) & (~(z))))
#define H(x, y, z) ((x) ^ (y) ^ (z)) #define H(x, y, z) ((x) ^ (y) ^ (z))
#define I(x, y, z) ((y) ^ ((x) | (~z))) #define I(x, y, z) ((y) ^ ((x) | (~(z))))
/* ROTATE_LEFT rotates x left n bits */ /* ROTATE_LEFT rotates x left n bits */
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))

2
src/video/SDL_blit_slow.c
View file

@ -24,7 +24,7 @@
#include "SDL_blit_slow.h" #include "SDL_blit_slow.h"
#define FORMAT_ALPHA 0 #define FORMAT_ALPHA 0
#define FORMAT_NO_ALPHA -1 #define FORMAT_NO_ALPHA (-1)
#define FORMAT_2101010 1 #define FORMAT_2101010 1
#define FORMAT_HAS_ALPHA(format) format == 0 #define FORMAT_HAS_ALPHA(format) format == 0
#define FORMAT_HAS_NO_ALPHA(format) format < 0 #define FORMAT_HAS_NO_ALPHA(format) format < 0

10
src/video/SDL_fillrect.c
View file

@ -64,27 +64,27 @@ static void SDL_FillRect##bpp##SSE(Uint8 *pixels, int pitch, Uint32 color, int w
SSE_BEGIN; \ SSE_BEGIN; \
\ \
while (h--) { \ while (h--) { \
n = w * bpp; \ n = (w) * (bpp); \
p = pixels; \ p = pixels; \
\ \
if (n > 63) { \ if (n > 63) { \
int adjust = 16 - ((uintptr_t)p & 15); \ int adjust = 16 - ((uintptr_t)p & 15); \
if (adjust < 16) { \ if (adjust < 16) { \
n -= adjust; \ n -= adjust; \
adjust /= bpp; \ adjust /= (bpp); \
while (adjust--) { \ while (adjust--) { \
*((type *)p) = (type)color; \ *((type *)p) = (type)color; \
p += bpp; \ p += (bpp); \
} \ } \
} \ } \
SSE_WORK; \ SSE_WORK; \
} \ } \
if (n & 63) { \ if (n & 63) { \
int remainder = (n & 63); \ int remainder = (n & 63); \
remainder /= bpp; \ remainder /= (bpp); \
while (remainder--) { \ while (remainder--) { \
*((type *)p) = (type)color; \ *((type *)p) = (type)color; \
p += bpp; \ p += (bpp); \
} \ } \
} \ } \
pixels += pitch; \ pixels += pitch; \

2
src/video/SDL_stretch.c
View file

@ -141,7 +141,7 @@ static int SDL_UpperSoftStretch(SDL_Surface *src, const SDL_Rect *srcrect,
#define FIXED_POINT(i) ((Uint32)(i) << 16) #define FIXED_POINT(i) ((Uint32)(i) << 16)
#define SRC_INDEX(fp) ((Uint32)(fp) >> 16) #define SRC_INDEX(fp) ((Uint32)(fp) >> 16)
#define INTEGER(fp) ((Uint32)(fp) >> PRECISION) #define INTEGER(fp) ((Uint32)(fp) >> PRECISION)
#define FRAC(fp) ((Uint32)(fp >> (16 - PRECISION)) & ((1 << PRECISION) - 1)) #define FRAC(fp) ((Uint32)((fp) >> (16 - PRECISION)) & ((1 << PRECISION) - 1))
#define FRAC_ZERO 0 #define FRAC_ZERO 0
#define FRAC_ONE (1 << PRECISION) #define FRAC_ONE (1 << PRECISION)
#define FP_ONE FIXED_POINT(1) #define FP_ONE FIXED_POINT(1)

4
src/video/SDL_video.c
View file

@ -134,7 +134,7 @@ static VideoBootStrap *bootstrap[] = {
SDL_UninitializedVideo(); \ SDL_UninitializedVideo(); \
return retval; \ return retval; \
} \ } \
if (!window || window->magic != &_this->window_magic) { \ if (!(window) || (window)->magic != &_this->window_magic) { \
SDL_SetError("Invalid window"); \ SDL_SetError("Invalid window"); \
return retval; \ return retval; \
} }
@ -144,7 +144,7 @@ static VideoBootStrap *bootstrap[] = {
SDL_UninitializedVideo(); \ SDL_UninitializedVideo(); \
return retval; \ return retval; \
} \ } \
if (displayIndex < 0 || displayIndex >= _this->num_displays) { \ if ((displayIndex) < 0 || (displayIndex) >= _this->num_displays) { \
SDL_SetError("displayIndex must be in the range 0 - %d", \ SDL_SetError("displayIndex must be in the range 0 - %d", \
_this->num_displays - 1); \ _this->num_displays - 1); \
return retval; \ return retval; \