# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1376227768 -7200
# Node ID 6c8e2d8712d8c09ad85788acce9eee2666fa5e72
# Parent  ad40f7d32846a608860531311ca173f0ef7d63f3# Parent  0e30f63d45d0fd5e68a1ae867bc21fdb5b7a7be5
Merge >=1.2 branch heads

diff -r ad40f7d32846 -r 6c8e2d8712d8 lemon/assert.h
--- a/lemon/assert.h	Sun Aug 11 15:28:12 2013 +0200
+++ b/lemon/assert.h	Sun Aug 11 15:29:28 2013 +0200
@@ -199,7 +199,7 @@
                              LEMON_FUNCTION_NAME,                       \
                              ::lemon::_assert_bits::cstringify(msg),    \
                              #exp), 0)))
-#    if LEMON_ENABLE_DEBUG
+#    if defined LEMON_ENABLE_DEBUG
 #      define LEMON_DEBUG(exp, msg)                                     \
          (static_cast<void> (!!(exp) ? 0 : (                            \
            LEMON_ASSERT_HANDLER(__FILE__, __LINE__,                     \