diff options
| author | Marijn Haverbeke <marijnh@gmail.com> | 2011-08-24 20:30:20 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2011-08-24 20:30:20 +0200 |
| commit | fa97793139a6b055eb0fba91ef7d64f6a545ca99 (patch) | |
| tree | 1dec35c744ab29903926a7e2465f4415995a7161 /src/rt | |
| parent | 60547f6500b0bf726e675b058ad0bdfe21455c11 (diff) | |
| download | rust-fa97793139a6b055eb0fba91ef7d64f6a545ca99.tar.gz rust-fa97793139a6b055eb0fba91ef7d64f6a545ca99.zip | |
Revert "Back out copy-glue"
This reverts commit 629ee94a0b360e2df1a1bbf7bf61ef346adf36ad.
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index c977f969e74..dd9f1d0cbc8 100644 --- a/src/rt/rust_internal.h +++ b/src/rt/rust_internal.h @@ -257,6 +257,8 @@ struct rust_timer { typedef void CDECL (glue_fn)(void *, rust_task *, void *, const type_desc **, void *); +typedef void CDECL (copy_glue_fn)(void *, rust_task *, void *, + const type_desc **, void *, void *); typedef void CDECL (cmp_glue_fn)(void *, rust_task *, void *, const type_desc **, void *, void *, int8_t); @@ -275,7 +277,7 @@ struct type_desc { glue_fn *take_glue; glue_fn *drop_glue; glue_fn *free_glue; - void *unused; + copy_glue_fn *copy_glue; glue_fn *sever_glue; // For GC. glue_fn *mark_glue; // For GC. uintptr_t is_stateful; |