diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-29 09:06:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-29 09:06:20 +0200 |
| commit | 3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8 (patch) | |
| tree | 4f945d98347a8e736e66af191c0ada59a6ad0a81 /mesalib | |
| parent | e514bce90660eb2ec76f50af13866f84da93ec60 (diff) | |
| parent | ce592e25d6303a8f4a8aa0e2918e0f72a35bf175 (diff) | |
| download | vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.gz vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.bz2 vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/Xext/hashtable.c
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.c b/mesalib/src/gallium/auxiliary/util/u_debug.c index df1d8e68c..0a350cae7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_debug.c +++ b/mesalib/src/gallium/auxiliary/util/u_debug.c @@ -48,9 +48,9 @@ void _debug_vprintf(const char *format, va_list ap) { + static char buf[4096] = {'\0'}; #if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED) /* We buffer until we find a newline. */ - static char buf[4096] = {'\0'}; size_t len = strlen(buf); int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap); if(ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) { @@ -58,8 +58,8 @@ void _debug_vprintf(const char *format, va_list ap) buf[0] = '\0'; } #else - /* Just print as-is to stderr */ - vfprintf(stderr, format, ap); + util_vsnprintf(buf, sizeof(buf), format, ap); + os_log_message(buf); #endif } |