diff --git a/3rdparty/bgfx/3rdparty/stb/stb_rect_pack.h b/3rdparty/bgfx/3rdparty/stb/stb_rect_pack.h index eb0ef2f268f..64c30761b80 100644 --- a/3rdparty/bgfx/3rdparty/stb/stb_rect_pack.h +++ b/3rdparty/bgfx/3rdparty/stb/stb_rect_pack.h @@ -488,6 +488,7 @@ static int rect_height_compare(const void *a, const void *b) return (p->w > q->w) ? -1 : (p->w < q->w); } +#if 0 static int rect_width_compare(const void *a, const void *b) { stbrp_rect *p = (stbrp_rect *) a; @@ -498,6 +499,7 @@ static int rect_width_compare(const void *a, const void *b) return 1; return (p->h > q->h) ? -1 : (p->h < q->h); } +#endif static int rect_original_order(const void *a, const void *b) { diff --git a/src/lib/util/xmlfile.c b/src/lib/util/xmlfile.c index e03893134f9..8635cfc427f 100644 --- a/src/lib/util/xmlfile.c +++ b/src/lib/util/xmlfile.c @@ -698,7 +698,7 @@ static void expat_data(void *data, const XML_Char *s, int len) if ((*curnode)->value != NULL) { memcpy(newdata, (*curnode)->value, oldlen); - free((*curnode)->value); + free((void *)(*curnode)->value); } (*curnode)->value = newdata; diff --git a/src/osd/sdl/aueffectutil.m b/src/osd/sdl/aueffectutil.m index 0dfb3376086..397fb640c68 100644 --- a/src/osd/sdl/aueffectutil.m +++ b/src/osd/sdl/aueffectutil.m @@ -20,6 +20,9 @@ typedef ComponentDescription AudioComponentDescription; +@protocol NSApplicationDelegate +@end + @protocol NSWindowDelegate @end @@ -723,7 +726,7 @@ static void UpdateChangeCountCallback(void *userData, @end -@interface AUEffectUtilAppDelegate : NSObject +@interface AUEffectUtilAppDelegate : NSObject { EffectInfo *effects;