diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-12 16:10:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-12 16:10:48 +0100 |
| commit | b8e0bdbda377d0a3c3e24bea62503b9f95f8249a (patch) | |
| tree | 9e0bb83cb9ca8cd34e3a878dfada15eed5d118bd | |
| parent | 3e9a1614966926a6067c977921d5aa270eba5da7 (diff) | |
| download | vim-git-7.4.512.tar.gz | |
updated for version 7.4.512v7.4.512
Problem: Cannot generate prototypes for Win32 files and VMS.
Solution: Add typedefs and #ifdef
| -rw-r--r-- | src/gui_w32.c | 4 | ||||
| -rw-r--r-- | src/os_vms.c | 2 | ||||
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 374ed4725..b81a74df9 100644 --- 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) { diff --git a/src/os_vms.c b/src/os_vms.c index 55876b27f..12eceedd0 100644 --- 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 */ diff --git a/src/os_win32.c b/src/os_win32.c index fcfafa01e..939563805 100644 --- 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 diff --git a/src/version.c b/src/version.c index f2b1ca7c5..2aaef3cc8 100644 --- 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, |