0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

[sbcl.git] / contrib / sb-grovel / defpackage.lisp

diff --git a/contrib/sb-grovel/defpackage.lisp b/contrib/sb-grovel/defpackage.lisp
index ffeb518..5f161b1 100644 (file)
--- a/contrib/sb-grovel/defpackage.lisp
+++ b/contrib/sb-grovel/defpackage.lisp
@@ -1,4 +1,9 @@
 (defpackage "SB-GROVEL"
   (:export "GROVEL-CONSTANTS-FILE")
+  (:shadow "TYPE" "UNION")
+  ;; FIXME: This is a really quick and dirty package lock compliance
+  ;; fix, that should be redone. Specifically, this is needed to address the
+  ;; nasty things done with SB-ALIEN:STRUCT.
+  #+sb-package-locks
+  (:implement "SB-ALIEN")
   (:use "COMMON-LISP" "SB-ALIEN" "ASDF" "SB-EXT"))
-