1.0.4.103: fix build with OpenMCL as the host

         * OpenMCL doesn't do the right thing with #+foo #+foo bar bar
         * An invalid slot type declaration

diff --git a/src/code/defmacro.lisp b/src/code/defmacro.lisp
index d45a27c..5bc4f47 100644 (file)
--- a/src/code/defmacro.lisp
+++ b/src/code/defmacro.lisp
@@ -43,7 +43,7 @@
                      ;; function, and report spurious warnings about
                      ;; redefinition a macro as a function, and then
                      ;; vice versa.
-                     #-sb-xc-host #-sb-xc-host named-lambda (defmacro ,name)
+                     #-sb-xc-host named-lambda #-sb-xc-host (defmacro ,name)
                      (,whole ,environment)
                       ,@local-decs
                       ,new-body))

diff --git a/src/code/macros.lisp b/src/code/macros.lisp
index bd9714b..3da5529 100644 (file)
--- a/src/code/macros.lisp
+++ b/src/code/macros.lisp
@@ -176,7 +176,7 @@ invoked. In that case it will store into PLACE and start over."
    (case-kind :initarg :case-kind
               :reader case-warning-case-kind)
    (occurrences :initarg :occurrences
-                :type (cons (integer 0) (cons t null))
+                :type list
                 :reader duplicate-case-key-warning-occurrences))
   (:report
     (lambda (condition stream)

diff --git a/version.lisp-expr b/version.lisp-expr
index ffb6733..453b3be 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.4.102"
+"1.0.4.103"