|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.512
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.512
|
|
|
22c937 |
Problem: Cannot generate prototypes for Win32 files and VMS.
|
|
|
22c937 |
Solution: Add typedefs and #ifdef
|
|
|
22c937 |
Files: src/os_win32.c, src/gui_w32.c, src/os_vms.c
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.511/src/os_win32.c 2014-11-05 18:35:59.104397681 +0100
|
|
|
22c937 |
--- src/os_win32.c 2014-11-12 15:33:13.136237810 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 135,140 ****
|
|
|
22c937 |
--- 135,142 ----
|
|
|
22c937 |
typedef int SE_OBJECT_TYPE;
|
|
|
22c937 |
typedef int PSNSECINFO;
|
|
|
22c937 |
typedef int PSNSECINFOW;
|
|
|
22c937 |
+ typedef int STARTUPINFO;
|
|
|
22c937 |
+ typedef int PROCESS_INFORMATION;
|
|
|
22c937 |
#endif
|
|
|
22c937 |
|
|
|
22c937 |
#ifndef FEAT_GUI_W32
|
|
|
22c937 |
*** ../vim-7.4.511/src/gui_w32.c 2014-10-06 18:10:04.521273516 +0200
|
|
|
22c937 |
--- src/gui_w32.c 2014-11-12 15:30:44.309980459 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 29,40 ****
|
|
|
22c937 |
# include "gui_dwrite.h"
|
|
|
22c937 |
#endif
|
|
|
22c937 |
|
|
|
22c937 |
! #if defined(FEAT_DIRECTX) || defined(PROTO)
|
|
|
22c937 |
static DWriteContext *s_dwc = NULL;
|
|
|
22c937 |
static int s_directx_enabled = 0;
|
|
|
22c937 |
static int s_directx_load_attempted = 0;
|
|
|
22c937 |
# define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL)
|
|
|
22c937 |
|
|
|
22c937 |
int
|
|
|
22c937 |
directx_enabled(void)
|
|
|
22c937 |
{
|
|
|
22c937 |
--- 29,42 ----
|
|
|
22c937 |
# include "gui_dwrite.h"
|
|
|
22c937 |
#endif
|
|
|
22c937 |
|
|
|
22c937 |
! #if defined(FEAT_DIRECTX)
|
|
|
22c937 |
static DWriteContext *s_dwc = NULL;
|
|
|
22c937 |
static int s_directx_enabled = 0;
|
|
|
22c937 |
static int s_directx_load_attempted = 0;
|
|
|
22c937 |
# define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL)
|
|
|
22c937 |
+ #endif
|
|
|
22c937 |
|
|
|
22c937 |
+ #if defined(FEAT_DIRECTX) || defined(PROTO)
|
|
|
22c937 |
int
|
|
|
22c937 |
directx_enabled(void)
|
|
|
22c937 |
{
|
|
|
22c937 |
*** ../vim-7.4.511/src/os_vms.c 2014-04-01 21:00:45.436733663 +0200
|
|
|
22c937 |
--- src/os_vms.c 2014-11-12 15:34:04.223639992 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 12,18 ****
|
|
|
22c937 |
#include "vim.h"
|
|
|
22c937 |
|
|
|
22c937 |
/* define _generic_64 for use in time functions */
|
|
|
22c937 |
! #ifndef VAX
|
|
|
22c937 |
# include <gen64def.h>
|
|
|
22c937 |
#else
|
|
|
22c937 |
/* based on Alpha's gen64def.h; the file is absent on VAX */
|
|
|
22c937 |
--- 12,18 ----
|
|
|
22c937 |
#include "vim.h"
|
|
|
22c937 |
|
|
|
22c937 |
/* define _generic_64 for use in time functions */
|
|
|
22c937 |
! #if !defined(VAX) && !defined(PROTO)
|
|
|
22c937 |
# include <gen64def.h>
|
|
|
22c937 |
#else
|
|
|
22c937 |
/* based on Alpha's gen64def.h; the file is absent on VAX */
|
|
|
22c937 |
*** ../vim-7.4.511/src/version.c 2014-11-12 16:05:01.142042845 +0100
|
|
|
22c937 |
--- src/version.c 2014-11-12 16:05:52.861446039 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 743,744 ****
|
|
|
22c937 |
--- 743,746 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 512,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
TIM: But follow only if you are men of valour. For the entrance to this cave
|
|
|
22c937 |
is guarded by a monster, a creature so foul and cruel that no man yet has
|
|
|
22c937 |
fought with it and lived. Bones of full fifty men lie strewn about its
|
|
|
22c937 |
lair ...
|
|
|
22c937 |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|