summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-01 21:13:30 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-01 21:13:30 +0000
commit11f3526734732ea90396cd08b9b04e7d3a107588 (patch)
treea1d906181bee16b4430df1866ef63a0d5417fbdb
parent3aab1f8467010bcb81081b55eef191452102ffa6 (diff)
ruby.h: set rb_event_flag_t to uint32_t
This ensures a consistent implementation between 32 and 64-bit platforms, as vm_trace.c limits events to 32-bits. This can also open up struct packing opportunities. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/ruby.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 99b7b0bfefa..fb9a06f9cbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 2 05:40:05 2014 Eric Wong <e@80x24.org>
+
+ * ruby.h: set rb_event_flag_t to uint32_t
+ [ruby-core:65315] [misc #10249]
+
Thu Oct 2 05:32:17 2014 Eric Wong <e@80x24.org>
* io.c (fptr_finalize): free memory before GC sweep
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index ff6c708ba95..8171ab3e321 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1728,7 +1728,7 @@ int ruby_native_thread_p(void);
#define RUBY_INTERNAL_EVENT_OBJSPACE_MASK 0x7f00000
#define RUBY_INTERNAL_EVENT_MASK 0xfffe0000
-typedef unsigned long rb_event_flag_t;
+typedef uint32_t rb_event_flag_t;
typedef void (*rb_event_hook_func_t)(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass);
#define RB_EVENT_HOOKS_HAVE_CALLBACK_DATA 1