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_msdos.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_msdos.c')
| -rw-r--r-- | src/os_msdos.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/os_msdos.c b/src/os_msdos.c index 2d1cf73dd..209bdd630 100644 --- a/src/os_msdos.c +++ b/src/os_msdos.c @@ -23,7 +23,10 @@ #include "vim.h" -#include <conio.h> +/* cproto fails on missing include files */ +#ifndef PROTO +# include <conio.h> +#endif /* * MS-DOS only code, not used for Win16. @@ -31,17 +34,19 @@ #ifndef WIN16 -#include <bios.h> -#ifdef DJGPP -# include <dpmi.h> -# include <signal.h> -# include <sys/movedata.h> -# include <crt0.h> -# ifdef FEAT_CLIPBOARD -# include <sys/segments.h> +#ifndef PROTO +# include <bios.h> +# ifdef DJGPP +# include <dpmi.h> +# include <signal.h> +# include <sys/movedata.h> +# include <crt0.h> +# ifdef FEAT_CLIPBOARD +# include <sys/segments.h> +# endif +# else +# include <alloc.h> # endif -#else -# include <alloc.h> #endif #if defined(DJGPP) || defined(PROTO) @@ -2130,8 +2135,10 @@ mch_rename(const char *OldFile, const char *NewFile) #undef setlocale -#include <go32.h> -#include <inlines/ctype.ha> +#ifndef PROTO +# include <go32.h> +# include <inlines/ctype.ha> +#endif #include <locale.h> #define UPCASE (__dj_ISALNUM | __dj_ISALPHA | __dj_ISGRAPH | __dj_ISPRINT | __dj_ISUPPER) |