diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-10-03 18:06:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-10-03 18:06:59 +0200 |
| commit | 277401a4809359a6379906bb98a7fbe4556ca380 (patch) | |
| tree | 1c3a16fe87f006d3df9227c434190f8c7443e6c7 | |
| parent | 149ccb364815ad74082a9e4f90baa02675ffe576 (diff) | |
| download | vim-277401a4809359a6379906bb98a7fbe4556ca380.tar.gz | |
Problem: Ruby compilation on Windows 32 bit doesn't work.
Solution: Only use some functions for 64 bit. (Ken Takata)
| -rw-r--r-- | src/if_ruby.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c index dd1ba470..aea7b565 100644 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@ -178,9 +178,11 @@ static void ruby_vim_init(void); #define rb_hash_new dll_rb_hash_new #define rb_inspect dll_rb_inspect #define rb_int2inum dll_rb_int2inum +#if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */ #define rb_fix2int dll_rb_fix2int #define rb_num2int dll_rb_num2int #define rb_num2uint dll_rb_num2uint +#endif #define rb_lastline_get dll_rb_lastline_get #define rb_lastline_set dll_rb_lastline_set #define rb_load_protect dll_rb_load_protect @@ -271,9 +273,11 @@ static VALUE (*dll_rb_hash_aset) (VALUE, VALUE, VALUE); static VALUE (*dll_rb_hash_new) (void); static VALUE (*dll_rb_inspect) (VALUE); static VALUE (*dll_rb_int2inum) (long); +#if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */ static long (*dll_rb_fix2int) (VALUE); static long (*dll_rb_num2int) (VALUE); static unsigned long (*dll_rb_num2uint) (VALUE); +#endif static VALUE (*dll_rb_lastline_get) (void); static void (*dll_rb_lastline_set) (VALUE); static void (*dll_rb_load_protect) (VALUE, int, int*); @@ -382,9 +386,11 @@ static struct {"rb_hash_new", (RUBY_PROC*)&dll_rb_hash_new}, {"rb_inspect", (RUBY_PROC*)&dll_rb_inspect}, {"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum}, +#if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */ {"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int}, {"rb_num2int", (RUBY_PROC*)&dll_rb_num2int}, {"rb_num2uint", (RUBY_PROC*)&dll_rb_num2uint}, +#endif {"rb_lastline_get", (RUBY_PROC*)&dll_rb_lastline_get}, {"rb_lastline_set", (RUBY_PROC*)&dll_rb_lastline_set}, {"rb_load_protect", (RUBY_PROC*)&dll_rb_load_protect}, diff --git a/src/version.c b/src/version.c index 1798f053..38f13246 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 676, +/**/ 675, /**/ 674, |