---

nikomatsakis · nikomatsakis · commit a8e7ebb1aa97 · 2011-12-14T14:32:25.000-08:00
yaml --- r: 6700 b: refs/heads/master c: 35fe86d h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1869306a7e3d94aaf474b6f27671d3844db088a1
+refs/heads/master: 35fe86dab74254cf4b74a4e28506fa84d81871e2
diff --git a/trunk/src/rt/memory_region.h b/trunk/src/rt/memory_region.h
@@ -15,7 +15,7 @@
 //
 // 0 --- no headers, no debugging support
 // 1 --- support poison, but do not track allocations
-// 2 --- track allocations in deatil
+// 2 --- track allocations in detail
 //
 // NB: please do not commit code with level 2. It's
 // hugely expensive and should only be used as a last resort.
diff --git a/trunk/src/rt/rust_upcall.cpp b/trunk/src/rt/rust_upcall.cpp
@@ -224,7 +224,7 @@ void upcall_s_clone_type_desc(s_clone_type_desc_args *args)
  * Called to deep-clone type descriptors so they can be attached to a sendable
  * function.  Eventually this should perhaps move to a centralized hashtable.
  */
-type_desc *
+extern "C" CDECL type_desc *
 upcall_clone_type_desc(type_desc *td) {
     s_clone_type_desc_args args = { td, 0 };
     SWITCH_STACK(&args, upcall_s_clone_type_desc);
diff --git a/trunk/src/rt/rustrt.def.in b/trunk/src/rt/rustrt.def.in
@@ -58,6 +58,7 @@ upcall_dynastack_free
 upcall_dynastack_mark
 upcall_fail
 upcall_free
+upcall_clone_type_desc
 upcall_get_type_desc
 upcall_log_type
 upcall_malloc

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 1869306a7e3d94aaf474b6f27671d3844db088a1`
	`2`	`+refs/heads/master: 35fe86dab74254cf4b74a4e28506fa84d81871e2`