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

[sbcl.git] / package-data-list.lisp-expr

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 8d46924..f0ab524 100644 (file)
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -560,6 +560,23 @@ like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*."
               "DEFCONSTANT-UNEQL" "DEFCONSTANT-UNEQL-NAME"
               "DEFCONSTANT-UNEQL-NEW-VALUE" "DEFCONSTANT-UNEQL-OLD-VALUE"
 
+               ;; package-locking stuff
+               #!+sb-package-locks "PACKAGE-LOCKED-P" 
+               #!+sb-package-locks "LOCK-PACKAGE" 
+               #!+sb-package-locks "UNLOCK-PACKAGE"
+               #!+sb-package-locks "PACKAGE-IMPLEMENTED-BY-LIST" 
+               #!+sb-package-locks "PACKAGE-IMPLEMENTS-LIST"
+               #!+sb-package-locks "ADD-IMPLEMENTATION-PACKAGE" 
+               #!+sb-package-locks "REMOVE-IMPLEMENTATION-PACKAGE"
+               #!+sb-package-locks "WITH-UNLOCKED-PACKAGES"
+               #!+sb-package-locks "PACKAGE-LOCK-VIOLATION"
+               #!+sb-package-locks "PACKAGE-LOCKED-ERROR"
+               #!+sb-package-locks "SYMBOL-PACKAGE-LOCKED-ERROR"            
+               #!+sb-package-locks "PACKAGE-LOCKED-ERROR-SYMBOL"
+               "WITHOUT-PACKAGE-LOCKS"
+               "DISABLE-PACKAGE-LOCKS"
+               "ENABLE-PACKAGE-LOCKS"
+
               ;; error signalled when attempt to load an invalid fasl
               ;; is made, so that user code can try to recompile, etc.
               "INVALID-FASL"
@@ -1062,6 +1079,11 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
                       "ALIEN-TYPE-TYPE"
                       "ALIEN-TYPE-TYPE-ALIEN-TYPE" "ALIEN-TYPE-TYPE-P"
                       "ALLOCATE-VECTOR"
+                       "ASSERT-SYMBOL-HOME-PACKAGE-UNLOCKED"
+                       "DISABLED-PACKAGE-LOCKS"
+                       "WITH-SINGLE-PACKAGE-LOCKED-ERROR"
+                       "PACKAGE-ERROR-FORMAT-ARGUMENTS"
+                       "PACKAGE-ERROR-FORMAT-CONTROL"
                       "ALWAYS-SUBTYPEP" "ARGS-TYPE" "ARGS-TYPE-ALLOWP"
                       "ARGS-TYPE-KEYP"
                       "ARGS-TYPE-KEYWORDS" "ARGS-TYPE-OPTIONAL" "ARGS-TYPE-P"