Mercurial > vim

comparison src/os_mswin.c @ 3927:e6d8b44065bc v7.3.719

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e618700297e8
children ff193256398a
comparison
equal deleted inserted replaced
3926:3ea4cfe2d1df 3927:e6d8b44065bc
24 24
25 #include "vim.h" 25 #include "vim.h"
26 26
27 #ifdef WIN16 27 #ifdef WIN16
28 # define SHORT_FNAME /* always 8.3 file name */ 28 # define SHORT_FNAME /* always 8.3 file name */
29 # include <dos.h> 29 /* cproto fails on missing include files */
30 # ifndef PROTO
31 # include <dos.h>
32 # endif
30 # include <string.h> 33 # include <string.h>
31 #endif 34 #endif
32 #include <sys/types.h> 35 #include <sys/types.h>
33 #include <signal.h> 36 #include <signal.h>
34 #include <limits.h> 37 #include <limits.h>
35 #include <process.h> 38 #ifndef PROTO
39 # include <process.h>
40 #endif
36 41
37 #undef chdir 42 #undef chdir
38 #ifdef __GNUC__ 43 #ifdef __GNUC__
39 # ifndef __MINGW32__ 44 # ifndef __MINGW32__
40 # include <dirent.h> 45 # include <dirent.h>
41 # endif 46 # endif
42 #else 47 #else
43 # include <direct.h> 48 # include <direct.h>
44 #endif 49 #endif
45 50
46 #if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) 51 #ifndef PROTO
47 # include <shellapi.h> 52 # if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32)
48 #endif 53 # include <shellapi.h>
49 54 # endif
50 #if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) 55
51 # include <dlgs.h> 56 # if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT)
52 # ifdef WIN3264 57 # include <dlgs.h>
53 # include <winspool.h> 58 # ifdef WIN3264
54 # else 59 # include <winspool.h>
55 # include <print.h> 60 # else
56 # endif 61 # include <print.h>
57 # include <commdlg.h> 62 # endif
58 #endif 63 # include <commdlg.h>
64 #endif
65
66 #endif /* PROTO */
59 67
60 #ifdef __MINGW32__ 68 #ifdef __MINGW32__
61 # ifndef FROM_LEFT_1ST_BUTTON_PRESSED 69 # ifndef FROM_LEFT_1ST_BUTTON_PRESSED
62 # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 70 # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001
63 # endif 71 # endif
2408 #endif /*FEAT_PRINTER && !FEAT_POSTSCRIPT*/ 2416 #endif /*FEAT_PRINTER && !FEAT_POSTSCRIPT*/
2409 2417
2410 2418
2411 2419
2412 #if defined(FEAT_SHORTCUT) || defined(PROTO) 2420 #if defined(FEAT_SHORTCUT) || defined(PROTO)
2413 # include <shlobj.h> 2421 # ifndef PROTO
2422 # include <shlobj.h>
2423 # endif
2414 2424
2415 /* 2425 /*
2416 * When "fname" is the name of a shortcut (*.lnk) resolve the file it points 2426 * When "fname" is the name of a shortcut (*.lnk) resolve the file it points
2417 * to and return that name in allocated memory. 2427 * to and return that name in allocated memory.
2418 * Otherwise NULL is returned. 2428 * Otherwise NULL is returned.