projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55dc1b8
)
Rename ptr variable as it is keyword in msvc inline assembly.
author
Jonathan Chambers
<joncham@gmail.com>
Fri, 31 Aug 2012 01:41:15 +0000
(21:41 -0400)
committer
Jonathan Chambers
<joncham@gmail.com>
Fri, 31 Aug 2012 01:41:15 +0000
(21:41 -0400)
mono/metadata/sgen-gc.c
patch
|
blob
|
history
diff --git
a/mono/metadata/sgen-gc.c
b/mono/metadata/sgen-gc.c
index 0efa256adf4d28f4c81fbda7df6d1b4644f5230e..e6a0bec947927159f12f0ddcb07e9750a6299b2a 100644
(file)
--- a/
mono/metadata/sgen-gc.c
+++ b/
mono/metadata/sgen-gc.c
@@
-3410,7
+3410,7
@@
update_current_thread_stack (void *start)
{
int stack_guard = 0;
#ifndef USE_MONO_CTX
- void *ptr = cur_thread_regs;
+ void *
reg_
ptr = cur_thread_regs;
#endif
SgenThreadInfo *info = mono_thread_info_current ();
@@
-3420,8
+3420,8
@@
update_current_thread_stack (void *start)
MONO_CONTEXT_GET_CURRENT (cur_thread_ctx);
info->monoctx = &cur_thread_ctx;
#else
- ARCH_STORE_REGS (ptr);
- info->stopped_regs = ptr;
+ ARCH_STORE_REGS (
reg_
ptr);
+ info->stopped_regs =
reg_
ptr;
#endif
if (gc_callbacks.thread_suspend_func)
gc_callbacks.thread_suspend_func (info->runtime_data, NULL);