Rename ptr variable as it is keyword in msvc inline assembly.
authorJonathan Chambers <joncham@gmail.com>
Fri, 31 Aug 2012 01:41:15 +0000 (21:41 -0400)
committerJonathan Chambers <joncham@gmail.com>
Fri, 31 Aug 2012 01:41:15 +0000 (21:41 -0400)
mono/metadata/sgen-gc.c

index 0efa256adf4d28f4c81fbda7df6d1b4644f5230e..e6a0bec947927159f12f0ddcb07e9750a6299b2a 100644 (file)
@@ -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);