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_mswin.c | |
| 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_mswin.c')
| -rw-r--r-- | src/os_mswin.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c index b4f662ad5..912864fd6 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -26,13 +26,18 @@ #ifdef WIN16 # define SHORT_FNAME /* always 8.3 file name */ -# include <dos.h> +/* cproto fails on missing include files */ +# ifndef PROTO +# include <dos.h> +# endif # include <string.h> #endif #include <sys/types.h> #include <signal.h> #include <limits.h> -#include <process.h> +#ifndef PROTO +# include <process.h> +#endif #undef chdir #ifdef __GNUC__ @@ -43,20 +48,23 @@ # include <direct.h> #endif -#if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) -# include <shellapi.h> -#endif - -#if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) -# include <dlgs.h> -# ifdef WIN3264 -# include <winspool.h> -# else -# include <print.h> +#ifndef PROTO +# if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) +# include <shellapi.h> # endif -# include <commdlg.h> + +# if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) +# include <dlgs.h> +# ifdef WIN3264 +# include <winspool.h> +# else +# include <print.h> +# endif +# include <commdlg.h> #endif +#endif /* PROTO */ + #ifdef __MINGW32__ # ifndef FROM_LEFT_1ST_BUTTON_PRESSED # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 @@ -2410,7 +2418,9 @@ mch_print_set_fg(long_u fgcol) #if defined(FEAT_SHORTCUT) || defined(PROTO) -# include <shlobj.h> +# ifndef PROTO +# include <shlobj.h> +# endif /* * When "fname" is the name of a shortcut (*.lnk) resolve the file it points |