stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-20 18:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
SteelT 2023-07-15 21:04:07 -04:00
commit 9a31064c4a
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libdivide.h
View file

@ -581,6 +581,11 @@ static inline void libdivide_u128_shift(uint64_t *u1, uint64_t *u0, int32_t sign
////////// UINT32
#if defined(__GNUC__) || defined(__clang__) // Suppress intentional compiler warnings
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Waggregate-return"
#endif
static inline struct libdivide_u32_t libdivide_internal_u32_gen(uint32_t d, int branchfree) {
struct libdivide_u32_t result;
uint32_t floor_log_2_d;
@ -647,6 +652,10 @@ struct libdivide_u32_t libdivide_u32_gen(uint32_t d) {
return ret;
}*/
#if defined(__GNUC__) || defined(__clang__) // Stop suppressing intentional compiler warnings
#pragma GCC diagnostic pop
#endif
uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom) {
uint8_t more = denom->more;
if (!denom->magic) {

2
src/m_misc.c
View file

@ -63,7 +63,7 @@ typedef off_t off64_t;
#if defined(__MINGW32__) && ((__GNUC__ > 7) || (__GNUC__ == 6 && __GNUC_MINOR__ >= 3)) && (__GNUC__ < 8)
#define PRIdS "u"
#elif defined (_WIN32)
#elif defined(_WIN32) && !defined(__MINGW64__)
#define PRIdS "Iu"
#else
#define PRIdS "zu"

9
src/r_draw8_npo2.c
View file

@ -18,6 +18,11 @@
#define SPANSIZE 16
#define INVSPAN 0.0625f
#if defined(__GNUC__) || defined(__clang__) // Suppress intentional libdivide compiler warnings - Also added to libdivide.h
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Waggregate-return"
#endif
/** \brief The R_DrawSpan_NPO2_8 function
Draws the actual span.
*/
@ -1572,3 +1577,7 @@ void R_DrawTiltedWaterSpan_NPO2_8(void)
}
#endif
}
#if defined(__GNUC__) || defined(__clang__) // Stop suppressing intentional libdivide compiler warnings
#pragma GCC diagnostic pop
#endif