2102f06
To: vim-dev@vim.org
2102f06
Subject: Patch 7.2.187
2102f06
Fcc: outbox
2102f06
From: Bram Moolenaar <Bram@moolenaar.net>
2102f06
Mime-Version: 1.0
2102f06
Content-Type: text/plain; charset=UTF-8
2102f06
Content-Transfer-Encoding: 8bit
2102f06
------------
2102f06
2102f06
Patch 7.2.187 (after 7.2.186)
2102f06
Problem:    Doesn't build with older versions of TCL. (Yongwei Wu)
2102f06
Solution:   Add #ifdefs. (Dominique Pelle)
2102f06
Files:	    src/if_tcl.c
2102f06
2102f06
2102f06
*** ../vim-7.2.186/src/if_tcl.c	2009-05-22 21:07:45.000000000 +0200
2102f06
--- src/if_tcl.c	2009-05-23 14:23:51.000000000 +0200
2102f06
***************
2102f06
*** 161,167 ****
2102f06
  # endif
2102f06
  
2102f06
  /*
2102f06
!  * Declare HANDLE for perl.dll and function pointers.
2102f06
   */
2102f06
  static HANDLE hTclLib = NULL;
2102f06
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
2102f06
--- 161,167 ----
2102f06
  # endif
2102f06
  
2102f06
  /*
2102f06
!  * Declare HANDLE for tcl.dll and function pointers.
2102f06
   */
2102f06
  static HANDLE hTclLib = NULL;
2102f06
  Tcl_Interp* (*dll_Tcl_CreateInterp)();
2102f06
***************
2102f06
*** 182,188 ****
2102f06
   * Make all runtime-links of tcl.
2102f06
   *
2102f06
   * 1. Get module handle using LoadLibraryEx.
2102f06
!  * 2. Get pointer to perl function by GetProcAddress.
2102f06
   * 3. Repeat 2, until get all functions will be used.
2102f06
   *
2102f06
   * Parameter 'libname' provides name of DLL.
2102f06
--- 182,188 ----
2102f06
   * Make all runtime-links of tcl.
2102f06
   *
2102f06
   * 1. Get module handle using LoadLibraryEx.
2102f06
!  * 2. Get pointer to tcl function by GetProcAddress.
2102f06
   * 3. Repeat 2, until get all functions will be used.
2102f06
   *
2102f06
   * Parameter 'libname' provides name of DLL.
2102f06
***************
2102f06
*** 1670,1692 ****
2102f06
  
2102f06
  static Tcl_ChannelType channel_type =
2102f06
  {
2102f06
!     "vimmessage",
2102f06
!     NULL,   /* blockmode */
2102f06
!     channel_close,
2102f06
!     channel_input,
2102f06
!     channel_output,
2102f06
!     NULL,   /* seek */
2102f06
!     NULL,   /* set option */
2102f06
!     NULL,   /* get option */
2102f06
!     channel_watch,
2102f06
!     channel_gethandle,
2102f06
!     NULL,
2102f06
!     NULL,
2102f06
!     NULL,
2102f06
!     NULL,
2102f06
!     NULL,
2102f06
!     NULL,
2102f06
!     NULL
2102f06
  };
2102f06
  
2102f06
  /**********************************
2102f06
--- 1670,1700 ----
2102f06
  
2102f06
  static Tcl_ChannelType channel_type =
2102f06
  {
2102f06
!     "vimmessage",	/* typeName */
2102f06
!     NULL,		/* version */
2102f06
!     channel_close,	/* closeProc */
2102f06
!     channel_input,	/* inputProc */
2102f06
!     channel_output,	/* outputProc */
2102f06
!     NULL,		/* seekProc */
2102f06
!     NULL,		/* setOptionProc */
2102f06
!     NULL,		/* getOptionProc */
2102f06
!     channel_watch,	/* watchProc */
2102f06
!     channel_gethandle,	/* getHandleProc */
2102f06
!     NULL,		/* close2Proc */
2102f06
!     NULL,		/* blockModeProc */
2102f06
! #ifdef TCL_CHANNEL_VERSION_2
2102f06
!     NULL,		/* flushProc */
2102f06
!     NULL,		/* handlerProc */
2102f06
! #endif
2102f06
! #ifdef TCL_CHANNEL_VERSION_3
2102f06
!     NULL,		/* wideSeekProc */
2102f06
! #endif
2102f06
! #ifdef TCL_CHANNEL_VERSION_4
2102f06
!     NULL,		/* threadActionProc */
2102f06
! #endif
2102f06
! #ifdef TCL_CHANNEL_VERSION_5
2102f06
!     NULL		/* truncateProc */
2102f06
! #endif
2102f06
  };
2102f06
  
2102f06
  /**********************************
2102f06
*** ../vim-7.2.186/src/version.c	2009-05-22 21:07:45.000000000 +0200
2102f06
--- src/version.c	2009-05-23 14:25:04.000000000 +0200
2102f06
***************
2102f06
*** 678,679 ****
2102f06
--- 678,681 ----
2102f06
  {   /* Add new patch number below this line */
2102f06
+ /**/
2102f06
+     187,
2102f06
  /**/
2102f06
2102f06
-- 
2102f06
Friends?  I have lots of friends!  In fact, I have every episode ever made.
2102f06
2102f06
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
2102f06
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
2102f06
\\\        download, build and distribute -- http://www.A-A-P.org        ///
2102f06
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///