diff --git a/lisp/Darwin-os.c b/lisp/Darwin-os.c
index e51b539be68788204f818c2cfd583bde19371241..7b23ca7b2a1e50f2e8b39f32fe7778e799e8a946 100644
--- a/lisp/Darwin-os.c
+++ b/lisp/Darwin-os.c
@@ -14,7 +14,7 @@
  * Frobbed for OpenBSD by Pierre R. Mai, 2001.
  * Frobbed for Darwin by Pierre R. Mai, 2003.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.c,v 1.11 2007/07/31 10:08:47 cshapiro Exp $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.c,v 1.12 2007/11/14 05:44:00 cshapiro Exp $
  *
  */
 
@@ -200,24 +200,23 @@ sc_reg(os_context_t * context, int offset)
 int *
 sc_reg(os_context_t *context, int offset)
 {
-    struct i386_thread_state *ss = &context->uc_mcontext->ss;
     switch (offset) {
       case 0:
-	  return &ss->eax;
+	  return (int *) &context->uc_mcontext->__ss.__eax;
       case 2:
-	  return &ss->ecx;
+	  return (int *) &context->uc_mcontext->__ss.__ecx;
       case 4:
-	  return &ss->edx;
+	  return (int *) &context->uc_mcontext->__ss.__edx;
       case 6:
-	  return &ss->ebx;
+	  return (int *) &context->uc_mcontext->__ss.__ebx;
       case 8:
-	  return &ss->esp;
+	  return (int *) &context->uc_mcontext->__ss.__esp;
       case 10:
-	  return &ss->ebp;
+	  return (int *) &context->uc_mcontext->__ss.__ebp;
       case 12:
-	  return &ss->esi;
+	  return (int *) &context->uc_mcontext->__ss.__esi;
       case 14:
-	  return &ss->edi;
+	  return (int *) &context->uc_mcontext->__ss.__edi;
     }
 
     return (int *) 0;
diff --git a/lisp/x86-lispregs.h b/lisp/x86-lispregs.h
index 9d9c89c93557cc368abee36b0bf223e3bd230f30..378c3aa85b34e1ede904377c82f335acc82c2abd 100644
--- a/lisp/x86-lispregs.h
+++ b/lisp/x86-lispregs.h
@@ -1,5 +1,5 @@
 /* x86-lispregs.h -*- Mode: C; -*-
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-lispregs.h,v 1.9 2007/07/25 10:23:54 cshapiro Exp $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-lispregs.h,v 1.10 2007/11/14 05:44:00 cshapiro Exp $
  */
 
 #ifndef _X86_LISPREGS_H_
@@ -50,7 +50,7 @@
 #define SC_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_EIP])
 #define SC_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_ESP])
 #elif defined(DARWIN)
-#define SC_PC(sc) ((sc)->uc_mcontext->ss.eip)
+#define SC_PC(sc) ((sc)->uc_mcontext->__ss.__eip)
 #define SC_SP(sc) SC_REG(sc, reg_ESP)
 #elif defined(__FreeBSD__)
 #define SC_PC(sc) ((sc)->uc_mcontext.mc_eip)