mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
merges r29102 from trunk into ruby_1_9_2. fixes #3743.
-- * regint.h (OnigStackIndex): the type should be intptr_t. Original Oniguruma assumes the size of long and that of void * are equal, but it's not true on LLP64 platform: mswin64. originally patched by shintaro kuwamoto [ruby-dev:42133] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4c513b5e68
commit
90918d356a
3 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
|||
Thu Aug 26 10:37:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* regint.h (OnigStackIndex): the type should be intptr_t.
|
||||
Original Oniguruma assumes the size of long and that of void *
|
||||
are equal, but it's not true on LLP64 platform: mswin64.
|
||||
originally patched by shintaro kuwamoto [ruby-dev:42133]
|
||||
|
||||
Thu Aug 26 10:38:11 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
|
||||
|
||||
* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
|
||||
|
|
2
regint.h
2
regint.h
|
@ -716,7 +716,7 @@ typedef struct {
|
|||
BBuf* mbuf; /* multi-byte info or NULL */
|
||||
} CClassNode;
|
||||
|
||||
typedef long OnigStackIndex;
|
||||
typedef intptr_t OnigStackIndex;
|
||||
|
||||
typedef struct _OnigStackType {
|
||||
unsigned int type;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "1.9.2"
|
||||
#define RUBY_RELEASE_DATE "2010-10-02"
|
||||
#define RUBY_PATCHLEVEL 12
|
||||
#define RUBY_PATCHLEVEL 13
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 9
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue