Merge branch 'gcc-4.5.1' of http://github.com/rillian/rust

pcwalton · pcwalton · commit 429964b4393b · 2010-10-28T10:52:59.000-07:00
diff --git a/src/rt/test/rust_test_runtime.cpp b/src/rt/test/rust_test_runtime.cpp
@@ -54,7 +54,7 @@ rust_task_test::worker::run() {
         kernel->create_domain(crate, "test");
     rust_dom *domain = handle->referent();
     domain->root_task->start(crate->get_exit_task_glue(),
-                             (uintptr_t)&task_entry, NULL, 0);
+                             (uintptr_t)&task_entry, (uintptr_t)NULL, 0);
     domain->start_main_loop();
     kernel->destroy_domain(domain);
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ rust_task_test::worker::run() {`
`54`	`54`	`kernel->create_domain(crate, "test");`
`55`	`55`	`rust_dom *domain = handle->referent();`
`56`	`56`	`domain->root_task->start(crate->get_exit_task_glue(),`
`57`		`- (uintptr_t)&task_entry, NULL, 0);`
	`57`	`+ (uintptr_t)&task_entry, (uintptr_t)NULL, 0);`
`58`	`58`	`domain->start_main_loop();`
`59`	`59`	`kernel->destroy_domain(domain);`
`60`	`60`	`}`