From 5ee541e484ca51db3f706ef6c7f5460e33f5cc86 Mon Sep 17 00:00:00 2001
From: jgarcia <jgarcia>
Date: Thu, 2 Aug 2007 19:34:49 +0000
Subject: [PATCH] Move the redefinition of with-lock into the compiler

---
 src/bare.lsp.in     | 3 ---
 src/cmp/cmpmain.lsp | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bare.lsp.in b/src/bare.lsp.in
index 05c656223..afa1bc6dc 100644
--- a/src/bare.lsp.in
+++ b/src/bare.lsp.in
@@ -46,9 +46,6 @@
 #-:wants-dlopen (setq *features* (delete :dlopen *features*))
 #+:wants-dlopen (push :dlopen *features*)
 
-#-threads
-(defmacro c::with-lock ((lock) &body body)
-  `(progn ,@body))
 (load #+(or cross ecl-min) "cmp/load.lsp"
       #-(or cross ecl-min) "cmp.so")
 
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index da3e53ca1..c732f92f6 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -12,6 +12,10 @@
 
 (in-package "COMPILER")
 
+#-threads
+(defmacro with-lock ((lock) &body body)
+  `(progn ,@body))
+
 (defun safe-system (string)
   (cmpnote "Invoking external command:~%;;; ~A~%" string)
   (let ((result (si:system string)))