Index: /branches/working-0711/ccl/lib/macros.lisp
===================================================================
--- /branches/working-0711/ccl/lib/macros.lisp	(revision 7853)
+++ /branches/working-0711/ccl/lib/macros.lisp	(revision 7854)
@@ -2337,8 +2337,11 @@
 ;;; Bind per-thread specials which help with lock accounting.
 (defmacro with-lock-context (&body body)
+  #+lock-accounting
   `(let* ((*locks-held* *locks-held*)
           (*locks-pending* *locks-pending*)
           (*lock-conses* *lock-conses*))
-    ,@body))
+    ,@body)
+  #-lock-accounting
+  `(progn ,@body))
 
 (defmacro with-lock-grabbed ((lock &optional