diff --git a/SheepShaver/src/Unix/Linux/asm_linux.S b/SheepShaver/src/Unix/Linux/asm_linux.S index a095925f..09346b70 100644 --- a/SheepShaver/src/Unix/Linux/asm_linux.S +++ b/SheepShaver/src/Unix/Linux/asm_linux.S @@ -400,7 +400,7 @@ jump_to_rom: lwz r13,XLM_TOC(r0) addi r3,r1,8 mr r4,r24 - bl EmulOp__FP13M68kRegistersUii + bl EmulOp // Restore 68k registers (M68kRegisters) lwz r8,8+0*4(r1) // d[0]..d[7] @@ -705,7 +705,7 @@ get_resource: lwz r3,56(r1) lwz r4,56+4(r1) lwz r5,56+8(r1) - bl check_load_invoc__FUisPPUs + bl check_load_invoc lwz r3,56+8(r1) // Restore handle // Return to caller @@ -736,7 +736,7 @@ get_1_resource: lwz r3,56(r1) lwz r4,56+4(r1) lwz r5,56+8(r1) - bl check_load_invoc__FUisPPUs + bl check_load_invoc lwz r3,56+8(r1) // Restore handle // Return to caller @@ -767,7 +767,7 @@ get_ind_resource: lwz r3,56(r1) lwz r4,56+4(r1) lwz r5,56+8(r1) - bl check_load_invoc__FUisPPUs + bl check_load_invoc lwz r3,56+8(r1) // Restore handle // Return to caller @@ -798,7 +798,7 @@ get_1_ind_resource: lwz r3,56(r1) lwz r4,56+4(r1) lwz r5,56+8(r1) - bl check_load_invoc__FUisPPUs + bl check_load_invoc lwz r3,56+8(r1) // Restore handle // Return to caller @@ -829,7 +829,7 @@ r_get_resource: lwz r3,56(r1) lwz r4,56+4(r1) lwz r5,56+8(r1) - bl check_load_invoc__FUisPPUs + bl check_load_invoc lwz r3,56+8(r1) // Restore handle // Return to caller diff --git a/SheepShaver/src/include/emul_op.h b/SheepShaver/src/include/emul_op.h index b594f31a..e93481ac 100644 --- a/SheepShaver/src/include/emul_op.h +++ b/SheepShaver/src/include/emul_op.h @@ -103,6 +103,6 @@ const uint16 M68K_EMUL_OP_EXTFS_COMM = M68K_EMUL_BREAK + OP_EXTFS_COMM; const uint16 M68K_EMUL_OP_EXTFS_HFS = M68K_EMUL_BREAK + OP_EXTFS_HFS; const uint16 M68K_EMUL_OP_IDLE_TIME = M68K_EMUL_BREAK + OP_IDLE_TIME; -extern void EmulOp(M68kRegisters *r, uint32 pc, int selector); +extern "C" void EmulOp(M68kRegisters *r, uint32 pc, int selector); #endif diff --git a/SheepShaver/src/rsrc_patches.cpp b/SheepShaver/src/rsrc_patches.cpp index d3f9161a..ce94a0f5 100644 --- a/SheepShaver/src/rsrc_patches.cpp +++ b/SheepShaver/src/rsrc_patches.cpp @@ -490,6 +490,8 @@ void CheckLoad(uint32 type, int16 id, uint16 *p, uint32 size) #ifdef __BEOS__ static +#else +extern "C" #endif void check_load_invoc(uint32 type, int16 id, uint16 **h) {