From dcdedf2e90836fe1634e787868b65739bf4aab1c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 15 Aug 2005 19:45:46 +0000 Subject: [PATCH] fix image loading with missing libraries --- library/compiler/intrinsics.factor | 2 ++ native/relocate.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/library/compiler/intrinsics.factor b/library/compiler/intrinsics.factor index c7c6712713..658bb83e29 100644 --- a/library/compiler/intrinsics.factor +++ b/library/compiler/intrinsics.factor @@ -54,6 +54,8 @@ sequences vectors words ; out-1 ] "intrinsic" set-word-prop +: value-types drop f ; + : node-peek ( node -- obj ) node-in-d peek ; : peek-2 dup length 2 - swap nth ; diff --git a/native/relocate.c b/native/relocate.c index ac37b96025..e2adba38b2 100644 --- a/native/relocate.c +++ b/native/relocate.c @@ -87,7 +87,7 @@ void relocate_data() void undefined_symbol(void) { - + general_error(ERROR_UNDEFINED_SYMBOL,F); } CELL get_rel_symbol(F_REL* rel) @@ -97,7 +97,7 @@ CELL get_rel_symbol(F_REL* rel) DLL* dll = (cons->cdr == F ? NULL : untag_dll(cons->cdr)); CELL sym; - if(!dll) + if(dll != NULL && !dll->dll) return (CELL)undefined_symbol; sym = (CELL)ffi_dlsym(dll,symbol,false);