Changeset 14646


Ignore:
Timestamp:
Feb 8, 2011, 1:47:26 AM (9 years ago)
Author:
gb
Message:

Fix Windows lossage from last commit.

Location:
trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-0/l0-cfm-support.lisp

    r14645 r14646  
    119119                       (setf (fv.addr fv) nil))))
    120120               fvs))))
     121
     122;;; Walk over all registered entrypoints, invalidating any whose container
     123;;; is the specified library.  Return true if any such entrypoints were
     124;;; found.
     125(defun unload-library-entrypoints (lib)
     126  (let* ((count 0))
     127    (declare (fixnum count))
     128    (maphash #'(lambda (k eep)
     129                 (declare (ignore k))
     130                 (when (eep.address eep)
     131                   (when (or (null lib) (eq (eep.container eep) lib))
     132                     (setf (eep.address eep) nil)
     133                     (incf count))))
     134             (eeps))   
     135    (not (zerop count))))
     136
     137(defun shared-library-with-name (name)
     138  (let* ((namelen (length name)))
     139    (dolist (lib *shared-libraries*)
     140      (let* ((libname (shlib.soname lib)))
     141        (when (%simple-string= name libname 0 0 namelen (length libname))
     142          (return lib))))))
    121143
    122144(defun generate-external-functions (path)
     
    216238      (return lib))))
    217239
    218 (defun shared-library-with-name (name)
    219   (let* ((namelen (length name)))
    220     (dolist (lib *shared-libraries*)
    221       (let* ((libname (shlib.soname lib)))
    222         (when (%simple-string= name libname 0 0 namelen (length libname))
    223           (return lib))))))
     240
    224241
    225242(defun shlib-from-map-entry (m)
     
    297314(init-shared-libraries)
    298315
    299 ;;; Walk over all registered entrypoints, invalidating any whose container
    300 ;;; is the specified library.  Return true if any such entrypoints were
    301 ;;; found.
    302 (defun unload-library-entrypoints (lib)
    303   (let* ((count 0))
    304     (declare (fixnum count))
    305     (maphash #'(lambda (k eep)
    306                  (declare (ignore k))
    307                  (when (eq (eep.container eep) lib)
    308                    (setf (eep.address eep) nil)
    309                    (incf count)))
    310              (eeps))   
    311     (not (zerop count))))
     316
    312317
    313318
     
    423428         (t (values nil "unknown error"))))))
    424429
    425 ;;; Walk over all registered entrypoints, invalidating any whose container
    426 ;;; is the specified library.  Return true if any such entrypoints were
    427 ;;; found.
    428 ;;;
    429 ;;; SAME AS LINUX VERSION
    430 ;;;
    431 (defun unload-library-entrypoints (lib)
    432   (let* ((count 0))
    433     (declare (fixnum count))
    434     (maphash #'(lambda (k eep)
    435                  (declare (ignore k))
    436                  (when (eep.address eep)
    437                    (when (or (null lib) (eq (eep.container eep) lib))
    438                      (setf (eep.address eep) nil)
    439                      (incf count))))
    440              (eeps))   
    441     (not (zerop count))))
     430
    442431
    443432;;;
  • trunk/source/level-1/linux-files.lisp

    r14645 r14646  
    987987  #+windows-target
    988988  (with-filename-cstrs ((name (shlib.pathname shlib)))
    989     (not (%null-ptr-p (#_FindModuleW name)))))
     989    (not (%null-ptr-p (#_GetModuleHandleW name)))))
    990990
    991991
Note: See TracChangeset for help on using the changeset viewer.