diff --git a/compat/strcasestr.h b/compat/strcasestr.h index 7bd9113326..71302516b3 100644 --- a/compat/strcasestr.h +++ b/compat/strcasestr.h @@ -27,10 +27,12 @@ #ifdef __cplusplus extern "C" { #endif + +extern char *strcasestr(const char *haystack, const char *needle); + // Avoid possible naming collisions during link since we prefer to use the actual name. #define strcasestr(haystack, needle) strcasestr_rarch__(haystack, needle) -char *strcasestr(const char *haystack, const char *needle); #ifdef __cplusplus } #endif diff --git a/logger/xdk1_logger_override.h b/logger/xdk1_logger_override.h index e670fee9e3..08b138e0c9 100644 --- a/logger/xdk1_logger_override.h +++ b/logger/xdk1_logger_override.h @@ -80,14 +80,13 @@ static inline void RARCH_WARN(const char *msg, ...) static inline void RARCH_ERR_V(const char *tag, const char *fmt, ...) { - char msg_new[1024], buffer[1024]; + char msg_new[1024]; #ifdef IS_SALAMANDER snprintf(msg_new, sizeof(msg_new), "RetroArch Salamander [ERR] :: %s%s", tag ? tag : "", fmt); #else snprintf(msg_new, sizeof(msg_new), "RetroArch [ERR] :: %s%s", tag ? tag : "", fmt); #endif - wvsprintf(buffer, msg_new, ap); - OutputDebugStringA(buffer); + OutputDebugStringA(fmt); } static inline void RARCH_ERR(const char *msg, ...)