zinface
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build

This commit is contained in:
David Carlier 2024-03-10 18:04:47 +00:00
parent 668a52bde0
commit cdbcd73bb9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SDL3/SDL_assert.h
View File

@ -82,7 +82,7 @@ assert can have unique static variables associated with it.
#if defined(_MSC_VER) && (_MSC_VER > 1400)
#define SDL_Assume(cond) __assume(cond)
#elif _SDL_HAS_BUILTIN(__builtin_assume)
#elif SDL_HAS_BUILTIN(__builtin_assume)
#define SDL_Assume(cond) __builtin_assume(cond)
#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4)))
#define SDL_Assume(cond) do { \

7
test/testplatform.c
View File

@ -438,17 +438,13 @@ static int TestAssertions(SDL_bool verbose)
return 0;
}
<<<<<<< HEAD
int main(int argc, char *argv[])
=======
int
TestAssume(SDL_bool verbose)
{
int max, count, i;
max = 16;
srand(time(0));
count = rand() % max;
count = SDLTest_RandomIntegerInRange(0, max);
SDL_Assume(count <= max);
for (i = 0; i < count; i ++);
return (0);
@ -456,7 +452,6 @@ TestAssume(SDL_bool verbose)
int
main(int argc, char *argv[])
>>>>>>> bfb4ecda9 (Adding SDL_Assume macro to give hint to the optimiser)
{
int i;
SDL_bool verbose = SDL_TRUE;