Index: /trunk/source/level-0/l0-cfm-support.lisp
===================================================================
--- /trunk/source/level-0/l0-cfm-support.lisp	(revision 14645)
+++ /trunk/source/level-0/l0-cfm-support.lisp	(revision 14646)
@@ -119,4 +119,26 @@
                        (setf (fv.addr fv) nil))))
                fvs))))
+
+;;; Walk over all registered entrypoints, invalidating any whose container
+;;; is the specified library.  Return true if any such entrypoints were
+;;; found.
+(defun unload-library-entrypoints (lib)
+  (let* ((count 0))
+    (declare (fixnum count))
+    (maphash #'(lambda (k eep)
+		 (declare (ignore k))
+                 (when (eep.address eep)
+                   (when (or (null lib) (eq (eep.container eep) lib))
+                     (setf (eep.address eep) nil)
+                     (incf count))))
+	     (eeps))    
+    (not (zerop count))))
+
+(defun shared-library-with-name (name)
+  (let* ((namelen (length name)))
+    (dolist (lib *shared-libraries*)
+      (let* ((libname (shlib.soname lib)))
+	(when (%simple-string= name libname 0 0 namelen (length libname))
+	  (return lib))))))
 
 (defun generate-external-functions (path)
@@ -216,10 +238,5 @@
       (return lib))))
 
-(defun shared-library-with-name (name)
-  (let* ((namelen (length name)))
-    (dolist (lib *shared-libraries*)
-      (let* ((libname (shlib.soname lib)))
-	(when (%simple-string= name libname 0 0 namelen (length libname))
-	  (return lib))))))
+
 
 (defun shlib-from-map-entry (m)
@@ -297,17 +314,5 @@
 (init-shared-libraries)
 
-;;; Walk over all registered entrypoints, invalidating any whose container
-;;; is the specified library.  Return true if any such entrypoints were
-;;; found.
-(defun unload-library-entrypoints (lib)
-  (let* ((count 0))
-    (declare (fixnum count))
-    (maphash #'(lambda (k eep)
-		 (declare (ignore k))
-		 (when (eq (eep.container eep) lib)
-		   (setf (eep.address eep) nil)
-		   (incf count)))
-	     (eeps))    
-    (not (zerop count))))
+
 
 
@@ -423,21 +428,5 @@
 	 (t (values nil "unknown error"))))))
 
-;;; Walk over all registered entrypoints, invalidating any whose container
-;;; is the specified library.  Return true if any such entrypoints were
-;;; found.
-;;;
-;;; SAME AS LINUX VERSION
-;;;
-(defun unload-library-entrypoints (lib)
-  (let* ((count 0))
-    (declare (fixnum count))
-    (maphash #'(lambda (k eep)
-		 (declare (ignore k))
-                 (when (eep.address eep)
-                   (when (or (null lib) (eq (eep.container eep) lib))
-                     (setf (eep.address eep) nil)
-                     (incf count))))
-	     (eeps))    
-    (not (zerop count))))
+
 
 ;;;
Index: /trunk/source/level-1/linux-files.lisp
===================================================================
--- /trunk/source/level-1/linux-files.lisp	(revision 14645)
+++ /trunk/source/level-1/linux-files.lisp	(revision 14646)
@@ -987,5 +987,5 @@
   #+windows-target
   (with-filename-cstrs ((name (shlib.pathname shlib)))
-    (not (%null-ptr-p (#_FindModuleW name)))))
+    (not (%null-ptr-p (#_GetModuleHandleW name)))))