To: vim_dev@googlegroups.com
Subject: Patch 7.4b.007
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4b.007
Problem:    On 32 bit MS-Windows :perldo does not work.
Solution:   Make sure time_t uses 32 bits. (Ken Takata)
Files:	    src/if_perl.xs, src/vim.h


*** ../vim-7.4b.006/src/if_perl.xs	2013-06-15 16:42:45.000000000 +0200
--- src/if_perl.xs	2013-08-02 16:02:27.000000000 +0200
***************
*** 13,20 ****
--- 13,34 ----
  #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
*** ../vim-7.4b.006/src/vim.h	2013-07-03 19:25:01.000000000 +0200
--- src/vim.h	2013-08-02 16:02:27.000000000 +0200
***************
*** 2180,2189 ****
    /* 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 */
--- 2180,2185 ----
*** ../vim-7.4b.006/src/version.c	2013-08-02 15:22:33.000000000 +0200
--- src/version.c	2013-08-02 16:03:32.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     7,
  /**/

-- 
You have the right to remain silent. Anything you say will be
misquoted, then used against you.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///