Mercurial > vim
comparison src/if_cscope.h @ 15868:7fad90423bd2 v8.1.0941
patch 8.1.0941: macros for MS-Windows are inconsistent
commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:44:42 2019 +0100
patch 8.1.0941: macros for MS-Windows are inconsistent
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 17 Feb 2019 17:45:08 +0100 |
parents | 4aead6a9b7a9 |
children | 6e3dc2d630c2 |
comparison
equal
deleted
inserted
replaced
15867:4a3823e692d3 | 15868:7fad90423bd2 |
---|---|
9 * BSD license, then sue me; I'm not worth much anyway. | 9 * BSD license, then sue me; I'm not worth much anyway. |
10 */ | 10 */ |
11 | 11 |
12 #if defined(FEAT_CSCOPE) || defined(PROTO) | 12 #if defined(FEAT_CSCOPE) || defined(PROTO) |
13 | 13 |
14 #if defined (WIN32) | 14 #if defined (MSWIN) |
15 # ifndef WIN32_LEAN_AND_MEAN | 15 # ifndef WIN32_LEAN_AND_MEAN |
16 # define WIN32_LEAN_AND_MEAN | 16 # define WIN32_LEAN_AND_MEAN |
17 # endif | 17 # endif |
18 # include <windows.h> | 18 # include <windows.h> |
19 #endif | 19 #endif |
43 #if defined(UNIX) | 43 #if defined(UNIX) |
44 pid_t pid; /* PID of the connected cscope process. */ | 44 pid_t pid; /* PID of the connected cscope process. */ |
45 dev_t st_dev; /* ID of dev containing cscope db */ | 45 dev_t st_dev; /* ID of dev containing cscope db */ |
46 ino_t st_ino; /* inode number of cscope db */ | 46 ino_t st_ino; /* inode number of cscope db */ |
47 #else | 47 #else |
48 # if defined(WIN32) | 48 # if defined(MSWIN) |
49 DWORD pid; /* PID of the connected cscope process. */ | 49 DWORD pid; /* PID of the connected cscope process. */ |
50 HANDLE hProc; /* cscope process handle */ | 50 HANDLE hProc; /* cscope process handle */ |
51 DWORD nVolume; /* Volume serial number, instead of st_dev */ | 51 DWORD nVolume; /* Volume serial number, instead of st_dev */ |
52 DWORD nIndexHigh; /* st_ino has no meaning in the Windows */ | 52 DWORD nIndexHigh; /* st_ino has no meaning in the Windows */ |
53 DWORD nIndexLow; | 53 DWORD nIndexLow; |