[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-45-gb6f5f1f

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  b6f5f1f52966abc0677ef7e506c5125cfea066d4 (commit)
      from  c65697e51b4cd61fc0a760273f4c2ecbcc95ff6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b6f5f1f52966abc0677ef7e506c5125cfea066d4
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Wed Oct 15 19:27:08 2014 -0700

    Fix compiler warning on ppc about &context->uc_mcontext->__es.__dar
    and __dsisr.
    
    __dar and __dsisr are declared to be type unsigned long, but on a
    32-bit system unsigned int and unsigned long are the same.

diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c
index 49e660c..e1120ab 100644
--- a/src/lisp/Darwin-os.c
+++ b/src/lisp/Darwin-os.c
@@ -238,9 +238,9 @@ sc_reg(os_context_t * context, int offset)
       case 35:
 	  return &state->__ctr;
       case 41:
-	  return &context->uc_mcontext->__es.__dar;
+	  return (unsigned int *) &context->uc_mcontext->__es.__dar;
       case 42:
-	  return &context->uc_mcontext->__es.__dsisr;
+	  return (unsigned int *) &context->uc_mcontext->__es.__dsisr;
     }
 
     return (unsigned int *) 0;

-----------------------------------------------------------------------

Summary of changes:
 src/lisp/Darwin-os.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp