diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-05-11 19:46:43 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-05-15 12:19:16 -0700 |
| commit | 56c0b188b66f71f55e2d577ca4a23830a31433e6 (patch) | |
| tree | 37fbbaf3c7a3d116c89a9c8caa17c871b0135b93 /src/rt/rust_builtin.cpp | |
| parent | c42b03de17b2d0c567dc85417ec22518d69fd8ae (diff) | |
| download | rust-56c0b188b66f71f55e2d577ca4a23830a31433e6.tar.gz rust-56c0b188b66f71f55e2d577ca4a23830a31433e6.zip | |
rt: Rename sched_key to rt_key
It is more general-purpose than holding scheduler pointers
Diffstat (limited to 'src/rt/rust_builtin.cpp')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 39a6f5bfd1b..1a64066b5a9 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -830,14 +830,14 @@ rust_get_rt_env() { } #ifndef _WIN32 -pthread_key_t sched_key = -1; +pthread_key_t rt_key = -1; #else -DWORD sched_key = -1; +DWORD rt_key = -1; #endif extern "C" void* -rust_get_sched_tls_key() { - return &sched_key; +rust_get_rt_tls_key() { + return &rt_key; } // Initialize the global state required by the new scheduler @@ -852,10 +852,10 @@ rust_initialize_global_state() { if (!initialized) { #ifndef _WIN32 - assert(!pthread_key_create(&sched_key, NULL)); + assert(!pthread_key_create(&rt_key, NULL)); #else - sched_key = TlsAlloc(); - assert(sched_key != TLS_OUT_OF_INDEXES); + rt_key = TlsAlloc(); + assert(rt_key != TLS_OUT_OF_INDEXES); #endif initialized = true; |
