steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix image loading with missing libraries

cvs
Slava Pestov 2005-08-15 19:45:46 +00:00
parent 979225805e
commit dcdedf2e90
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/compiler/intrinsics.factor
View File

@ -54,6 +54,8 @@ sequences vectors words ;
out-1 out-1
] "intrinsic" set-word-prop ] "intrinsic" set-word-prop
: value-types drop f ;
: node-peek ( node -- obj ) node-in-d peek ; : node-peek ( node -- obj ) node-in-d peek ;
: peek-2 dup length 2 - swap nth ; : peek-2 dup length 2 - swap nth ;

4
native/relocate.c
View File

@ -87,7 +87,7 @@ void relocate_data()
void undefined_symbol(void) void undefined_symbol(void)
{ {
general_error(ERROR_UNDEFINED_SYMBOL,F);
} }
CELL get_rel_symbol(F_REL* rel) 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)); DLL* dll = (cons->cdr == F ? NULL : untag_dll(cons->cdr));
CELL sym; CELL sym;
if(!dll) if(dll != NULL && !dll->dll)
return (CELL)undefined_symbol; return (CELL)undefined_symbol;
sym = (CELL)ffi_dlsym(dll,symbol,false); sym = (CELL)ffi_dlsym(dll,symbol,false);