From 351d68b1e1a52421fffa9daa675ca1cefd243cf6 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 20 Dec 2013 21:07:31 -0800 Subject: [PATCH] Revert "alien.libraries: dlopen should handle resource:-paths" This reverts commit cc663fff88fa7321af6deea424890128d3b0bc07. Conflicts: basis/alien/libraries/libraries-tests.factor --- basis/alien/libraries/libraries-tests.factor | 10 +--------- basis/alien/libraries/libraries.factor | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/basis/alien/libraries/libraries-tests.factor b/basis/alien/libraries/libraries-tests.factor index 29a13b983b..2721ce48c0 100755 --- a/basis/alien/libraries/libraries-tests.factor +++ b/basis/alien/libraries/libraries-tests.factor @@ -1,5 +1,4 @@ -USING: alien alien.libraries alien.syntax formatting io.pathnames -kernel system tools.test ; +USING: alien alien.libraries alien.syntax tools.test kernel ; IN: alien.libraries.tests [ f ] [ DLL" fadfasdfsada" dll-valid? ] unit-test @@ -27,10 +26,3 @@ IN: alien.libraries.tests "test-library" "blah" cdecl add-library? "blah" remove-library ] unit-test - -! dlopen resolves resource:-paths -os windows? [ - [ t ] [ - vm file-stem "resource:/%s.exe" sprintf dlopen dll-valid? - ] unit-test -] when diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor index 3fb8324186..7e8611405e 100755 --- a/basis/alien/libraries/libraries.factor +++ b/basis/alien/libraries/libraries.factor @@ -5,7 +5,7 @@ kernel namespaces destructors sequences strings system io.pathnames fry combinators vocabs ; IN: alien.libraries -: dlopen ( path -- dll ) absolute-path native-string>alien (dlopen) ; +: dlopen ( path -- dll ) native-string>alien (dlopen) ; : dlsym ( name dll -- alien ) [ string>symbol ] dip (dlsym) ;