]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.046 v7.3.046
authorBram Moolenaar <Bram@vim.org>
Wed, 27 Oct 2010 15:40:59 +0000 (17:40 +0200)
committerBram Moolenaar <Bram@vim.org>
Wed, 27 Oct 2010 15:40:59 +0000 (17:40 +0200)
Problem:    Can't build Ruby on MS-Windows.
Solution:   Add #ifdef, don't use WIN3264 before including vim.h.

src/if_ruby.c
src/version.c

index 0e95e17b708196e58426e0e788ca4bb72e3311b5..397b77284aac165dd99bb69e1dd1bda9e7b461a1 100644 (file)
@@ -14,7 +14,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "auto/config.h"
+#ifdef HAVE_CONFIG_H
+# include "auto/config.h"
+#endif
 
 #ifdef _WIN32
 # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
@@ -50,7 +52,7 @@
 #  define RUBY_EXPORT
 # endif
 
-#ifndef WIN3264
+#if !(defined(WIN32) || defined(_WIN64))
 # include <dlfcn.h>
 # define HINSTANCE void*
 # define RUBY_PROC void*
index d9d2b58b7d08904b70e460ccac6eada38c5e3a53..48f81afa6673b436592a563fb98b1a7fae107ccf 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    46,
 /**/
     45,
 /**/