summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-12-09 16:17:45 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2008-12-09 16:17:45 +0000
commitee0735fa2d4b2d2a9eae1f55e8f93f1f57feaf6d (patch)
tree1eb05270973ea3a5c396f3175d1500b5297176ef /src/gallium/auxiliary/util
parente8a1b31ddf39f0b09eb85653cebb9808a5daf0a9 (diff)
parent51d9642f74c3f418b2f8a56b4b17c94eb91b39d1 (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/p_debug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index 0d019808b0..210332f87a 100644
--- 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))