diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-30 15:25:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-30 15:25:26 +0000 |
| commit | 6908e4960d7cc6b271dcf70e87ce37104ce8ef5b (patch) | |
| tree | e598e7730112ae0458415792c290c0f2b56c143c /ChangeLog | |
| parent | 0328cdf92cf392dccf1c9667b5006a497043bb85 (diff) | |
encoding.h: fix conflicts
* include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
rid of conflict with macros defined in internal.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Aug 31 00:25:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get + rid of conflict with macros defined in internal.h. + Fri Aug 30 22:37:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread_pthread.c (native_thread_init_stack): wait the creator thread |