]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.676 v7.3.676
authorBram Moolenaar <Bram@vim.org>
Wed, 3 Oct 2012 16:06:59 +0000 (18:06 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 3 Oct 2012 16:06:59 +0000 (18:06 +0200)
Problem:    Ruby compilation on Windows 32 bit doesn't work.
Solution:   Only use some functions for 64 bit. (Ken Takata)

src/if_ruby.c
src/version.c

index dd1ba47009d5cd54f83a13a53ad9dc9ddfb8511a..aea7b5656ea5e3731198173b95d34a69e0b61c75 100644 (file)
@@ -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},
index 1798f053c23a7f953629ecfb5bf05b0c85b1c329..38f132467ca8d0fc535017091b025fe28d18bc1e 100644 (file)
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    676,
 /**/
     675,
 /**/