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

2008-12-09 16:17:45 +00:00
parent e8a1b31ddf 51d9642f74
commit ee0735fa2d
3 changed files with 70 additions and 1 deletions
--- a/src/gallium/auxiliary/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
@@ -376,7 +376,7 @@ void _debug_assert_fail(const char *expr,
                        const char *function) 
 {
   _debug_printf("%s:%u:%s: Assertion `%s' failed.\n", file, line, function, expr);
-#if defined(PIPE_OS_WINDOWS)
+#if defined(PIPE_OS_WINDOWS) && !defined(PIPE_SUBSYSTEM_WINDOWS_USER)
   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", FALSE))
 #else
   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", TRUE))