[pypy-commit] pypy stmgc-c7: Silence warnings

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70181:bd87e99d44f6
Date: 2014-03-23 08:13 +0100
http://bitbucket.org/pypy/pypy/changeset/bd87e99d44f6/

Log:	Silence warnings

diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -911,7 +911,7 @@
 void pypy_stm_register_thread_local(void)
 {
     stm_register_thread_local(&stm_thread_local);
-    stm_thread_local.mem_clear_on_abort = &pypy_g_ExcData;
+    stm_thread_local.mem_clear_on_abort = (char *)&pypy_g_ExcData;
     stm_thread_local.mem_bytes_to_clear_on_abort = sizeof(pypy_g_ExcData);
 }
 '''
diff --git a/rpython/translator/stm/src_stm/stmgcintf.c b/rpython/translator/stm/src_stm/stmgcintf.c
--- a/rpython/translator/stm/src_stm/stmgcintf.c
+++ b/rpython/translator/stm/src_stm/stmgcintf.c
@@ -95,7 +95,8 @@
     stm_jmpbuf_t jmpbuf;
     long volatile v_counter = 0;
 #ifndef NDEBUG
-    object_t **volatile old_shadowstack = stm_thread_local.shadowstack;
+    struct stm_shadowentry_s *volatile old_shadowstack =
+        stm_thread_local.shadowstack;
 #endif
 
     STM_PUSH_ROOT(stm_thread_local, arg);