about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-04-24 15:34:02 -0700
committerBrian Anderson <banderson@mozilla.com>2013-04-24 15:34:04 -0700
commit436657b5f04a6d7504cfc00224c26910569c67eb (patch)
tree22e12e7587e8b907d454e6dfd7539417fbf26a85
parent08659f5acc42e9ed73c85359a2b1f02e5484dbb0 (diff)
downloadrust-436657b5f04a6d7504cfc00224c26910569c67eb.tar.gz
rust-436657b5f04a6d7504cfc00224c26910569c67eb.zip
Rename cleanup_task_local_map_ to cleanup_task_local_map_extern_cb
Per pcwalton's suggestion.
-rw-r--r--src/libcore/task/local_data_priv.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/task/local_data_priv.rs b/src/libcore/task/local_data_priv.rs
index e32d18719bd..fdf1fa2a532 100644
--- a/src/libcore/task/local_data_priv.rs
+++ b/src/libcore/task/local_data_priv.rs
@@ -83,7 +83,7 @@ unsafe fn get_local_map(handle: Handle) -> TaskLocalMap {
 
 unsafe fn get_task_local_map(task: *rust_task) -> TaskLocalMap {
 
-    extern fn cleanup_task_local_map_(map_ptr: *libc::c_void) {
+    extern fn cleanup_task_local_map_extern_cb(map_ptr: *libc::c_void) {
         cleanup_task_local_map(map_ptr);
     }
 
@@ -97,7 +97,7 @@ unsafe fn get_task_local_map(task: *rust_task) -> TaskLocalMap {
         // Use reinterpret_cast -- transmute would take map away from us also.
         rt::rust_set_task_local_data(
             task, cast::transmute(map));
-        rt::rust_task_local_data_atexit(task, cleanup_task_local_map_);
+        rt::rust_task_local_data_atexit(task, cleanup_task_local_map_extern_cb);
         // Also need to reference it an extra time to keep it for now.
         let nonmut = cast::transmute::<TaskLocalMap,
                                        @~[Option<TaskLocalElement>]>(map);