From e8f9662af6b9a119bd3e86fed09e9757f0f8391f Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 16 Dec 2012 14:46:16 -0500 Subject: [PATCH] SDL_assertion messages use "\n" instead of "\r\n" on non-Windows platforms. --- src/SDL_assert.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/SDL_assert.c b/src/SDL_assert.c index 1d0fd0539..541cb5f72 100644 --- a/src/SDL_assert.c +++ b/src/SDL_assert.c @@ -126,6 +126,12 @@ static void SDL_AbortAssertion(void) static SDL_assert_state SDL_PromptAssertion(const SDL_assert_data *data, void *userdata) { +#ifdef __WIN32__ + #define ENDLINE "\r\n" +#else + #define ENDLINE "\n" +#endif + const char *envr; SDL_assert_state state = SDL_ASSERTION_ABORT; SDL_Window *window; @@ -150,7 +156,8 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata) return SDL_ASSERTION_ABORT; } SDL_snprintf(message, SDL_MAX_LOG_MESSAGE, - "Assertion failure at %s (%s:%d), triggered %u %s:\r\n '%s'", + "Assertion failure at %s (%s:%d), triggered %u %s:" ENDLINE + " '%s'", data->function, data->filename, data->linenum, data->trigger_count, (data->trigger_count == 1) ? "time" : "times", data->condition);