edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on windows

Browse source 
const int wasn't detected as compile-time constant.
This commit is contained in:
heinrich5991 2014-04-08 19:35:13 +02:00 committed by oy
parent 8bcd40fa91
commit 2d81b2fc33
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/base/system.c
View file

@ -109,19 +109,20 @@ void dbg_msg(const char *sys, const char *fmt, ...)
static void logger_stdout(const char *line) static void logger_stdout(const char *line)
{ {
#if defined(CONF_FAMILY_WINDOWS) #if defined(CONF_FAMILY_WINDOWS)
static const size_t MAX_LENGTH = 1024; #define _MAX_LENGTH 1024
static const size_t MAX_LENGTH_ERROR = 1024 + 32; #define _MAX_LENGTH_ERROR (_MAX_LENGTH+32)
static const int UNICODE_REPLACEMENT_CHAR = 0xfffd; static const int UNICODE_REPLACEMENT_CHAR = 0xfffd;
static const char *STR_TOO_LONG = "(str too long)"; static const char *STR_TOO_LONG = "(str too long)";
static const char *INVALID_UTF8 = "(invalid utf8)"; static const char *INVALID_UTF8 = "(invalid utf8)";
wchar_t wline[MAX_LENGTH_ERROR]; wchar_t wline[_MAX_LENGTH_ERROR];
size_t len = 0; size_t len = 0;
const char *read = line; const char *read = line;
const char *error = STR_TOO_LONG; const char *error = STR_TOO_LONG;
while(len < MAX_LENGTH) while(len < _MAX_LENGTH)
{ {
// Read a character. This also advances the read pointer // Read a character. This also advances the read pointer
int glyph = str_utf8_decode(&read); int glyph = str_utf8_decode(&read);
@ -165,20 +166,23 @@ static void logger_stdout(const char *line)
if(character == 0) if(character == 0)
break; break;
dbg_assert(len < MAX_LENGTH_ERROR, "str too short for error"); dbg_assert(len < _MAX_LENGTH_ERROR, "str too short for error");
wline[len++] = character; wline[len++] = character;
read++; read++;
} }
} }
// Terminate the line // Terminate the line
dbg_assert(len < MAX_LENGTH_ERROR, "str too short for \\r"); dbg_assert(len < _MAX_LENGTH_ERROR, "str too short for \\r");
wline[len++] = '\r'; wline[len++] = '\r';
dbg_assert(len < MAX_LENGTH_ERROR, "str too short for \\n"); dbg_assert(len < _MAX_LENGTH_ERROR, "str too short for \\n");
wline[len++] = '\n'; wline[len++] = '\n';
// Ignore any error that might occur // Ignore any error that might occur
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wline, len, 0, 0); WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wline, len, 0, 0);
#undef _MAX_LENGTH
#undef _MAX_LENGTH_ERROR
#else #else
printf("%s\n", line); printf("%s\n", line);
fflush(stdout); fflush(stdout);