Clean up some symbol politics in the new Vorbis code.

icculus · Jul 16, 2018 · a1b9fb2 · a1b9fb2
1 parent 57ded12
commit a1b9fb2
Showing 1 changed file with 13 additions and 30 deletions.
diff --git a/src/SDL_sound_vorbis.c b/src/SDL_sound_vorbis.c
@@ -32,55 +32,38 @@
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 #define STB_VORBIS_BIG_ENDIAN 1
 #endif
+
+#if !defined(__clang_analyzer__)
 #ifdef assert
 #undef assert
 #endif
-#define assert SDL_assert
 #ifdef memset
 #undef memset
 #endif
-#define memset SDL_memset
-#ifdef memcmp
-#undef memcmp
-#endif
-#define memcmp SDL_memcmp
 #ifdef memcpy
 #undef memcpy
 #endif
-#define memcpy SDL_memcpy
-#ifdef qsort
-#undef qsort
+#ifdef alloca
+#undef alloca
 #endif
+#define assert SDL_assert
+#define memset SDL_memset
+#define memcmp SDL_memcmp
+#define memcpy SDL_memcpy
 #define qsort SDL_qsort
-#ifdef pow
-#undef pow
-#endif
 #define pow SDL_pow
-#ifdef floor
-#undef floor
-#endif
 #define floor SDL_floor
-#ifdef malloc
-#undef malloc
-#endif
 #define malloc SDL_malloc
-#ifdef realloc
-#undef realloc
-#endif
 #define realloc SDL_realloc
-#ifdef free
-#undef free
-#endif
 #define free SDL_free
-#ifdef alloca
-#undef alloca
-#endif
 #define alloca(x) ((void *) SDL_stack_alloc(Uint8, (x)))
 #define dealloca(x) SDL_stack_free((x))
-#ifdef ldexp
-#undef ldexp
-#endif
 #define ldexp(v, e) SDL_scalbn((v), (e))
+#define abs(x) SDL_abs(x)
+#define cos(x) SDL_cos(x)
+#define sin(x) SDL_sin(x)
+#define log(x) SDL_log(x)
+#endif
 #include "stb_vorbis.h"