diff --git a/ChangeLog.n b/ChangeLog.n index 52acd6df1c4eb69bd2f844930a417842ad177825..2aacf530f6224867a6656569d020ee977a6a363d 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -4,6 +4,12 @@ don't forget to change the version in utils/packages.lisp if you do anything user visible. ******************************************************************************* +2009-06-29 Andreas Fuchs <afuchs@franz.com> + + * utils/lisp-utilities.lisp: Drop our hand-knit versions of _malloc and _free, + replace them with excl:aclmalloc and excl:aclfree: They do the same thing, + as of 8.1. + 2009-06-16 Andreas Fuchs <afuchs@franz.com> * silica/db-scroll.lisp: Fix a strange type error in scrolling that would crash on OS diff --git a/tk-silica/xt-graphics.lisp b/tk-silica/xt-graphics.lisp index 701630881aadfdfc3e17b2978c261be1a461b5d6..b218f8dbd28af644c072fb9d0bd1b171ca3dc2c6 100644 --- a/tk-silica/xt-graphics.lisp +++ b/tk-silica/xt-graphics.lisp @@ -1468,9 +1468,9 @@ (if (= s-1 s-2) (let ((r (sqrt s-1))) (setq x-radius r y-radius r)) - ;; Degrade to drawing a rectilinear ellipse - (setq x-radius (sqrt s-1) - y-radius (sqrt s-2)))))) + ;; Degrade to drawing a rectilinear ellipse + (setq x-radius (sqrt s-1) + y-radius (sqrt s-2)))))) (setq start-angle (* start-angle #.(float (/ (* 360 64) (* 2 pi)) 0s0))) (setq end-angle (* end-angle #.(float (/ (* 360 64) (* 2 pi)) 0s0))) @@ -1483,7 +1483,7 @@ end-angle start-angle) (discard-illegal-coordinates medium-draw-ellipse* x-min y-min) - (tk::draw-ellipse-1 drawable + (tk::draw-ellipse-1 drawable (adjust-ink (decode-ink (medium-ink medium) medium) medium x-min diff --git a/tk-silica/xt-silica.lisp b/tk-silica/xt-silica.lisp index 08d25ddb422a1a2f11e09c1aa46681e5a5491645..015956ad8b93c23eb73472dd062ac3212ae93bbd 100644 --- a/tk-silica/xt-silica.lisp +++ b/tk-silica/xt-silica.lisp @@ -1855,9 +1855,9 @@ the geometry of the children. Instead the parent has control. ")) (defun find-port-from-display (display) (find-if #'(lambda (port) - (and (typep port 'xt-port) - (eq (port-display port) display))) - *ports*)) + (and (typep port 'xt-port) + (eq (port-display port) display))) + *ports*)) (defmethod port-canonicalize-gesture-spec ((port xt-port) gesture-spec &optional modifier-state) diff --git a/utils/lisp-utilities.lisp b/utils/lisp-utilities.lisp index 385fbb80b36ac7badf96c617f332258492edd33c..a8b264f17f1451591bc31dddd0d0a2876d34dfa2 100644 --- a/utils/lisp-utilities.lisp +++ b/utils/lisp-utilities.lisp @@ -1658,21 +1658,8 @@ ;;; Foreign Structure Constructors ;;; -(eval-when (compile) - (ff:def-foreign-call (_malloc "malloc") - ((data :int)) - :call-direct t - :arg-checking nil - :returning :foreign-address) - (ff:def-foreign-call (_free "free") - ((data (* :char) simple-string)) - :call-direct t - :strings-convert nil ; cac 25feb00 - :arg-checking nil - :returning :void)) - ;;; This is here to limit need for FF package to compile time. -(defun system-free (x) (_free x)) +(defun system-free (x) (excl:aclfree x)) ;;; ALLOCATE-CSTRUCT was adapted from ff:make-cstruct. ;;; We aren't using ff:make-cstruct because it uses excl:aclmalloc. @@ -1691,7 +1678,7 @@ (defun allocate-memory (size init) ;; Used only by ALLOCATE-CSTRUCT. - (let ((pointer (_malloc size))) + (let ((pointer (excl:aclmalloc size))) (when init (do ((i 0 (+ i #-64bit 4 #+64bit 8))) ((>= i size)) @@ -1716,7 +1703,7 @@ (length (length octets))) (declare (optimize (safety 0)) (type fixnum length)) - (setf address (_malloc length)) + (setf address (excl:aclmalloc length)) (dotimes (i length) (declare (fixnum i)) (setf (sys:memref-int address 0 i :unsigned-byte)