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

[mesa.git] / src / gallium / auxiliary / util / p_debug.c

diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index 0d019808b09638bbda97f40ef4c76d4ce7a39202..210332f87a58b4ce25baea482c6f63260b0769ce 100644 (file)
--- 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))