Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/util/u_math.c
This commit is contained in:
Brian Paul
2008-11-10 11:19:30 -07:00
3 changed files with 5 additions and 3 deletions

View File

@@ -136,8 +136,10 @@ void _debug_vprintf(const char *format, va_list ap)
#elif defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)
/* TODO */
#else /* !PIPE_SUBSYSTEM_WINDOWS */
#ifdef DEBUG
vfprintf(stderr, format, ap);
#endif
#endif
}