summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-10-27 17:40:59 +0200
committerBram Moolenaar <Bram@vim.org>2010-10-27 17:40:59 +0200
commit2d73ff4500d695ebc967c60b31c67f63fada794c (patch)
tree0add6731700a0e18c72f1b5239cb609cc09401eb
parentb3ae56cf2b02059b2a4fd2e1bee67970ec9b0dba (diff)
downloadvim-git-2d73ff4500d695ebc967c60b31c67f63fada794c.tar.gz
updated for version 7.3.046v7.3.046
Problem: Can't build Ruby on MS-Windows. Solution: Add #ifdef, don't use WIN3264 before including vim.h.
-rw-r--r--src/if_ruby.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/if_ruby.c b/src/if_ruby.c
index 0e95e17b7..397b77284 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -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*
diff --git a/src/version.c b/src/version.c
index d9d2b58b7..48f81afa6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 46,
+/**/
45,
/**/
44,