diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-11-20 16:53:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-11-20 16:53:39 +0100 |
| commit | 82881498663eb692e90dcfb9da0a7f573f228e35 (patch) | |
| tree | bf2ffc25d638538bd870377c87d07709c0fcae6f /src/os_win32.h | |
| parent | 0ac24e1ef4b099c95c55261bc2d227ca5707d295 (diff) | |
| download | vim-git-82881498663eb692e90dcfb9da0a7f573f228e35.tar.gz | |
updated for version 7.3.719v7.3.719
Problem: Cannot run new version of cproto, it fails on missing include
files.
Solution: Add lots of #ifndef PROTO
Diffstat (limited to 'src/os_win32.h')
| -rw-r--r-- | src/os_win32.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/os_win32.h b/src/os_win32.h index c155fb23f..71b760956 100644 --- a/src/os_win32.h +++ b/src/os_win32.h @@ -12,7 +12,10 @@ #include "os_dos.h" /* common MS-DOS and Win32 stuff */ #ifndef __CYGWIN__ -#include <direct.h> /* for _mkdir() */ +/* cproto fails on missing include files */ +# ifndef PROTO +# include <direct.h> /* for _mkdir() */ +# endif #endif /* Stop the VC2005 compiler from nagging. */ @@ -101,7 +104,9 @@ #ifndef COBJMACROS # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ #endif -#include <windows.h> +#ifndef PROTO +# include <windows.h> +#endif /* * Win32 has plenty of memory, use large buffers @@ -194,6 +199,8 @@ Trace(char *pszFormat, ...); # define vim_mkdir(x, y) mch_mkdir(x) #endif +#ifndef PROTO + /* Enable common dialogs input unicode from IME if posible. */ #ifdef FEAT_MBYTE /* The variables are defined in os_win32.c. */ @@ -207,3 +214,5 @@ extern BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT); # define pIsDialogMessage IsDialogMessage # define pPeekMessage PeekMessage #endif + +#endif /* PROTO */ |