Changeset 2734


Ignore:
Timestamp:
Oct 30, 2005, 6:28:16 AM (15 years ago)
Author:
gb
Message:

Lots of conditionalization assumed that :MCL implies :OPENMCL.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/tools/defsystem.lisp

    r504 r2734  
    840840;;; Let's be smart about CLtL2 compatible Lisps:
    841841(eval-when (compile load eval)
    842   #+(or (and allegro-version>= (version>= 4 0)) :mcl :sbcl)
     842  #+(or (and allegro-version>= (version>= 4 0)) :mcl :openmcl :sbcl)
    843843  (pushnew :cltl2 *features*))
    844844
     
    869869      :vms
    870870      :mcl
     871      :openmcl
    871872      :lispworks
    872873      :clisp
     
    39143915                         #+(and :excl :allegro-v4.0) 'cltl1:require))
    39153916
    3916   (let (#+:CCL (ccl:*warn-if-redefine-kernel* nil))
     3917  (let (#+(or :CCL :openmcl) (ccl:*warn-if-redefine-kernel* nil))
    39173918    ;; Note that lots of lisps barf if we redefine a function from
    39183919    ;; the LISP package. So what we do is define a macro with an
     
    39413942  (setf *old-require*
    39423943        (symbol-function
    3943          #-(or (and :excl :allegro-v4.0) :mcl :sbcl :lispworks) 'lisp:require
     3944         #-(or (and :excl :allegro-v4.0) :mcl :openmcl :sbcl :lispworks) 'lisp:require
    39443945         #+(and :excl :allegro-v4.0) 'cltl1:require
    39453946         #+:sbcl 'cl:require
     
    39513952
    39523953  (unless *dont-redefine-require*
    3953     (let (#+(or :mcl (and :CCL (not :lispworks)))
     3954    (let (#+(or :mcl :openmcl (and :CCL (not :lispworks)))
    39543955          (ccl:*warn-if-redefine-kernel* nil))
    39553956      #-(or (and allegro-version>= (version>= 4 1)) :lispworks)
    39563957      (setf (symbol-function
    3957              #-(or (and :excl :allegro-v4.0) :mcl :sbcl :lispworks) 'lisp:require
     3958             #-(or (and :excl :allegro-v4.0) :mcl :openmcl :sbcl :lispworks) 'lisp:require
    39583959             #+(and :excl :allegro-v4.0) 'cltl1:require
    39593960             #+:lispworks3.1 'common-lisp::require
Note: See TracChangeset for help on using the changeset viewer.