Skip to content

Commit cba3669

Browse files
authored
Merge branch 'raysan5:master' into master
2 parents 01de3b4 + b80250b commit cba3669

File tree

7 files changed

+1282
-1301
lines changed

7 files changed

+1282
-1301
lines changed

src/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ OBJS = rcore.o \
638638
rshapes.o \
639639
rtextures.o \
640640
rtext.o \
641-
utils.o
641+
utils.o
642642

643643
ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_GLFW)
644644
ifeq ($(USE_EXTERNAL_GLFW),FALSE)

src/external/RGFW.h

+1,142-1,201
Large diffs are not rendered by default.

src/external/sinfl.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,11 @@ extern int zsinflate(void *out, int cap, const void *in, int size);
171171

172172
static int
173173
sinfl_bsr(unsigned n) {
174-
#if defined(_MSC_VER) && !defined(__clang__)
175-
_BitScanReverse(&n, n);
176-
return n;
177-
#elif defined(__GNUC__) || defined(__clang__)
174+
#ifdef _MSC_VER
175+
unsigned long uln = 0;
176+
_BitScanReverse(&uln, n);
177+
return (int)(uln);
178+
#else // defined(__GNUC__) || defined(__clang__) || defined(__TINYC__)
178179
return 31 - __builtin_clz(n);
179180
#endif
180181
}

0 commit comments

Comments
 (0)