Mercurial > vim

comparison src/os_win32.h @ 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 d24d309c365f
children 26e59a39fdd9
comparison
equal deleted inserted replaced
3926:3ea4cfe2d1df 3927:e6d8b44065bc
10 * Win32 (Windows NT and Windows 95) machine-dependent things. 10 * Win32 (Windows NT and Windows 95) machine-dependent things.
11 */ 11 */
12 12
13 #include "os_dos.h" /* common MS-DOS and Win32 stuff */ 13 #include "os_dos.h" /* common MS-DOS and Win32 stuff */
14 #ifndef __CYGWIN__ 14 #ifndef __CYGWIN__
15 #include <direct.h> /* for _mkdir() */ 15 /* cproto fails on missing include files */
16 # ifndef PROTO
17 # include <direct.h> /* for _mkdir() */
18 # endif
16 #endif 19 #endif
17 20
18 /* Stop the VC2005 compiler from nagging. */ 21 /* Stop the VC2005 compiler from nagging. */
19 #if _MSC_VER >= 1400 22 #if _MSC_VER >= 1400
20 # define _CRT_SECURE_NO_DEPRECATE 23 # define _CRT_SECURE_NO_DEPRECATE
99 # define STRICT 102 # define STRICT
100 #endif 103 #endif
101 #ifndef COBJMACROS 104 #ifndef COBJMACROS
102 # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */ 105 # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */
103 #endif 106 #endif
104 #include <windows.h> 107 #ifndef PROTO
108 # include <windows.h>
109 #endif
105 110
106 /* 111 /*
107 * Win32 has plenty of memory, use large buffers 112 * Win32 has plenty of memory, use large buffers
108 */ 113 */
109 #define CMDBUFFSIZE 1024 /* size of the command processing buffer */ 114 #define CMDBUFFSIZE 1024 /* size of the command processing buffer */
191 #ifdef __BORLANDC__ 196 #ifdef __BORLANDC__
192 # define vim_mkdir(x, y) mkdir(x) 197 # define vim_mkdir(x, y) mkdir(x)
193 #else 198 #else
194 # define vim_mkdir(x, y) mch_mkdir(x) 199 # define vim_mkdir(x, y) mch_mkdir(x)
195 #endif 200 #endif
201
202 #ifndef PROTO
196 203
197 /* Enable common dialogs input unicode from IME if posible. */ 204 /* Enable common dialogs input unicode from IME if posible. */
198 #ifdef FEAT_MBYTE 205 #ifdef FEAT_MBYTE
199 /* The variables are defined in os_win32.c. */ 206 /* The variables are defined in os_win32.c. */
200 extern LRESULT (WINAPI *pDispatchMessage)(LPMSG); 207 extern LRESULT (WINAPI *pDispatchMessage)(LPMSG);
205 # define pDispatchMessage DispatchMessage 212 # define pDispatchMessage DispatchMessage
206 # define pGetMessage GetMessage 213 # define pGetMessage GetMessage
207 # define pIsDialogMessage IsDialogMessage 214 # define pIsDialogMessage IsDialogMessage
208 # define pPeekMessage PeekMessage 215 # define pPeekMessage PeekMessage
209 #endif 216 #endif
217
218 #endif /* PROTO */