From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 2 Aug 2013 14:10:32 +0000 (+0200)
Subject: updated for version 7.4b.007
X-Git-Tag: v7.4b.007
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aee1f4a5b5065da6602fb30e01529644e85eb036;p=vim

updated for version 7.4b.007
Problem:    On 32 bit MS-Windows :perldo does not work.
Solution:   Make sure time_t uses 32 bits. (Ken Takata)
---

diff --git a/src/if_perl.xs b/src/if_perl.xs
index 118f60487..4c46f2abb 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -13,8 +13,22 @@
 #define _memory_h	/* avoid memset redeclaration */
 #define IN_PERL_FILE	/* don't include if_perl.pro from proto.h */
 
+/*
+ * Currently 32-bit version of ActivePerl is built with VC6.
+ * (http://community.activestate.com/faq/windows-compilers-perl-modules)
+ * It means that time_t should be 32-bit. However the default size of
+ * time_t is 64-bit since VC8. So we have to define _USE_32BIT_TIME_T.
+ */
+#if defined(WIN32) && !defined(_WIN64)
+# define _USE_32BIT_TIME_T
+#endif
+
 #include "vim.h"
 
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+
 
 /*
  * Work around clashes between Perl and Vim namespace.	proto.h doesn't
diff --git a/src/version.c b/src/version.c
index 77c3e8d57..d34ed63dd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    7,
 /**/
     6,
 /**/
diff --git a/src/vim.h b/src/vim.h
index 1555defda..3d61f3a35 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2180,10 +2180,6 @@ typedef int VimClipboard;	/* This is required for the prototypes. */
   /* Borland has the structure stati64 but not _stati64 */
 #  define _stati64 stati64
 # endif
-
-# include <EXTERN.h>
-# include <perl.h>
-# include <XSUB.h>
 #endif
 
 /* values for vim_handle_signal() that are not a signal */