about summary refs log tree commit diff
path: root/src/rt/rust_log.cpp
diff options
context:
space:
mode:
authorJyun-Yan You <jyyou@cs.nctu.edu.tw>2012-01-15 03:47:29 +0800
committerBrian Anderson <banderson@mozilla.com>2012-01-16 00:41:14 -0800
commite4d553c534e80442bed5ce63f74ca67112035d08 (patch)
tree4127a788ab285b07d1ab538ee99ce50e668fa985 /src/rt/rust_log.cpp
parent79d738845569e69fdbd4d378e203432f0e3bc91d (diff)
downloadrust-e4d553c534e80442bed5ce63f74ca67112035d08.tar.gz
rust-e4d553c534e80442bed5ce63f74ca67112035d08.zip
use correct size for logging mod_entry state fields
The compiler outputs 32-bit values for these and on 64-bit FreeBSD
the runtime was scribbling on some state used by getenv and segfaulting.
Diffstat (limited to 'src/rt/rust_log.cpp')
-rw-r--r--src/rt/rust_log.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp
index 7119a64d2b8..61b1fe9aaa0 100644
--- a/src/rt/rust_log.cpp
+++ b/src/rt/rust_log.cpp
@@ -143,7 +143,7 @@ rust_log::trace_ln(rust_task *task, uint32_t level, char *message) {
 
 struct mod_entry {
     const char* name;
-    size_t* state;
+    uint32_t* state;
 };
 
 struct cratemap {
@@ -232,19 +232,19 @@ void print_crate_log_map(const cratemap* map) {
 
 // These are pseudo-modules used to control logging in the runtime.
 
-size_t log_rt_mem;
-size_t log_rt_comm;
-size_t log_rt_task;
-size_t log_rt_dom;
-size_t log_rt_trace;
-size_t log_rt_cache;
-size_t log_rt_upcall;
-size_t log_rt_timer;
-size_t log_rt_gc;
-size_t log_rt_stdlib;
-size_t log_rt_kern;
-size_t log_rt_backtrace;
-size_t log_rt_callback;
+uint32_t log_rt_mem;
+uint32_t log_rt_comm;
+uint32_t log_rt_task;
+uint32_t log_rt_dom;
+uint32_t log_rt_trace;
+uint32_t log_rt_cache;
+uint32_t log_rt_upcall;
+uint32_t log_rt_timer;
+uint32_t log_rt_gc;
+uint32_t log_rt_stdlib;
+uint32_t log_rt_kern;
+uint32_t log_rt_backtrace;
+uint32_t log_rt_callback;
 
 static const mod_entry _rt_module_map[] =
     {{"::rt::mem", &log_rt_mem},