X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=8c32729a9f935da63effb445d56688e08807f562;hb=6caf3ed5713773cb423f46bf40a29f2438c97c78;hp=e81185d7ca7b9ce0912c916ec3e7d614fd66ffb9;hpb=bd2df60f7c3f579a9c7610925c79a0e783adaa0e;p=sbcl.git

diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp
index e81185d..8c32729 100644
--- a/src/code/foreign.lisp
+++ b/src/code/foreign.lisp
@@ -16,8 +16,8 @@
 
 (defun extern-alien-name (name)
   (handler-case
-      #!+(or elf (and mach-o (not dlshim))) (coerce name 'base-string)
-      #!+(or (and mach-o dlshim) win32) (concatenate 'base-string "_" name)
+      #!-win32 (coerce name 'base-string)
+      #!+win32 (concatenate 'base-string "_" name)
     (error ()
       (error "invalid external alien name: ~S" name))))
 
@@ -34,11 +34,7 @@
   (let ((extern (extern-alien-name name)))
     (values
      (or (gethash extern table)
-         (gethash (concatenate 'base-string
-                               #!+(and mach-o dlshim) "_ldso_stub_"
-                               #!+(and mach-o (not dlshim)) "ldso_stub__"
-                               #!-mach-o "ldso_stub__"
-                               extern) table)))))
+         (gethash (concatenate 'base-string "ldso_stub__" extern) table)))))
 
 (defun find-foreign-symbol-address (name)
   "Returns the address of the foreign symbol NAME, or NIL. Does not enter the