[crawl-ref-commits] (branch: master) updated. 0.7.0-a0-908-gb5a7564

[KiloByte <cas...@us...>]

       via  b5a7564a4345cb6044c7164e69d3cc56ee3a8ed3 (commit)
      from  0b96abeddb4783ba01ddab45701aa760c187870c (commit)

-----------------------------------------------------------------------
commit b5a7564a4345cb6044c7164e69d3cc56ee3a8ed3
Author: Adam Borowski <kil...@an...>
Date:   Tue Mar 30 13:22:47 2010 +0200

    Don't redefine ASSERTS if it's already defined.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/debug.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/debug.h b/crawl-ref/source/debug.h
index f8750b2..00df554 100644
--- a/crawl-ref/source/debug.h
+++ b/crawl-ref/source/debug.h
@@ -37,7 +37,7 @@
 #define COMPILE_CHECK(expr, tag)
 #endif
 
-#ifdef DEBUG
+#if defined(DEBUG) && !defined(ASSERTS)
 #define ASSERTS
 #endif
 

-- 
Dungeon Crawl Stone Soup