X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-assem.S;h=cd0656387750ca3ea4bcf642c139c0e975de2eab;hb=c1aeac123df223746249567a9c0d2f656d1222cb;hp=b881daa5e5bbca58313203b20adc9f41572b4d75;hpb=be9eb6c67b5f43a095c3de17bea945c309d662e4;p=sbcl.git

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index b881daa..cd06563 100644
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -208,7 +208,7 @@ Ldone:
 	mov	%ebx,%ebp	# Switch to new frame.
 
 	/* Indirect the closure. */
-	call	*CLOSURE_FUNCTION_OFFSET(%eax)
+	call	*CLOSURE_FUN_OFFSET(%eax)
 	
 	/* Multi-value return; blow off any extra values. */
 	mov	%ebx, %esp
@@ -262,7 +262,7 @@ GNAME(undefined_tramp):
 	int3
 	.byte	trap_Error
         .byte   2
-#ifdef type_LongFloat
+#ifdef LONG_FLOAT_WIDETAG
         .byte   24
 #else
         .byte   23
@@ -279,14 +279,14 @@ GNAME(undefined_tramp):
 	.global GNAME(closure_tramp)
 	.type	GNAME(closure_tramp),@function
 GNAME(closure_tramp):
-	movl	FDEFN_FUNCTION_OFFSET(%eax),%eax
+	movl	FDEFN_FUN_OFFSET(%eax),%eax
 	/* FIXME: The '*' after "jmp" in the next line is from PVE's
 	 * patch posted to the CMU CL mailing list Oct 6, 1999. It looks
 	 * reasonable, and it certainly seems as though if CMU CL needs it,
 	 * SBCL needs it too, but I haven't actually verified that it's
 	 * right. It would be good to find a way to force the flow of
 	 * control through here to test it. */
-	jmp	*CLOSURE_FUNCTION_OFFSET(%eax)
+	jmp	*CLOSURE_FUN_OFFSET(%eax)
 	.size	GNAME(closure_tramp), .-GNAME(closure_tramp)
 
 /*