Mercurial > vim
diff src/os_msdos.c @ 3927:e6d8b44065bc v7.3.719
updated for version 7.3.719
Problem: Cannot run new version of cproto, it fails on missing include
files.
Solution: Add lots of #ifndef PROTO
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Tue, 20 Nov 2012 16:53:39 +0100 |
parents | 286ba0251c0a |
children | 04736b4030ec |
line wrap: on
line diff
--- 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 ch #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)