Mercurial > vim

changeset 6359:9f9058aeba0d v7.4.512

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.512 Problem: Cannot generate prototypes for Win32 files and VMS. Solution: Add typedefs and #ifdef
author Bram Moolenaar <bram@vim.org>
date Wed, 12 Nov 2014 16:10:48 +0100
parents e83e7ad4871e
children 135901a3246c
files src/gui_w32.c src/os_vms.c src/os_win32.c src/version.c
diffstat 4 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -29,12 +29,14 @@
 # include "gui_dwrite.h"
 #endif
 
-#if defined(FEAT_DIRECTX) || defined(PROTO)
+#if defined(FEAT_DIRECTX)
 static DWriteContext *s_dwc = NULL;
 static int s_directx_enabled = 0;
 static int s_directx_load_attempted = 0;
 # define IS_ENABLE_DIRECTX() (s_directx_enabled && s_dwc != NULL)
-
+#endif
+
+#if defined(FEAT_DIRECTX) || defined(PROTO)
     int
 directx_enabled(void)
 {
--- a/src/os_vms.c
+++ b/src/os_vms.c
@@ -12,7 +12,7 @@
 #include	"vim.h"
 
 /* define _generic_64 for use in time functions */
-#ifndef VAX
+#if !defined(VAX) && !defined(PROTO)
 #   include <gen64def.h>
 #else
 /* based on Alpha's gen64def.h; the file is absent on VAX */
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -135,6 +135,8 @@ typedef int BY_HANDLE_FILE_INFORMATION;
 typedef int SE_OBJECT_TYPE;
 typedef int PSNSECINFO;
 typedef int PSNSECINFOW;
+typedef int STARTUPINFO;
+typedef int PROCESS_INFORMATION;
 #endif
 
 #ifndef FEAT_GUI_W32
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    512,
+/**/
     511,
 /**/
     510,