diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
| commit | 4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch) | |
| tree | 7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/structs.h | |
| parent | 78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff) | |
| download | vim-git-4f97475d326c2773a78561fb874e4f23c25cbcd9.tar.gz | |
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
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)
Diffstat (limited to 'src/structs.h')
| -rw-r--r-- | src/structs.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/structs.h b/src/structs.h index fdef811e4..ab84eaeaa 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1073,7 +1073,7 @@ typedef struct { int vc_type; /* zero or one of the CONV_ values */ int vc_factor; /* max. expansion factor */ -# ifdef WIN3264 +# ifdef MSWIN int vc_cpfrom; /* codepage to convert from (CONV_CODEPAGE) */ int vc_cpto; /* codepage to convert to (CONV_CODEPAGE) */ # endif @@ -1101,7 +1101,7 @@ typedef struct #define CONV_TO_LATIN1 3 #define CONV_TO_LATIN9 4 #define CONV_ICONV 5 -#ifdef WIN3264 +#ifdef MSWIN # define CONV_CODEPAGE 10 /* codepage -> codepage */ #endif #ifdef MACOS_X @@ -1187,7 +1187,7 @@ typedef long_u hash_T; /* Type for hi_hash */ #ifdef FEAT_NUM64 /* Use 64-bit Number. */ -# ifdef WIN3264 +# ifdef MSWIN # ifdef PROTO typedef long varnumber_T; typedef unsigned long uvarnumber_T; @@ -1543,7 +1543,7 @@ struct jobvar_S #ifdef UNIX pid_t jv_pid; #endif -#ifdef WIN32 +#ifdef MSWIN PROCESS_INFORMATION jv_proc_info; HANDLE jv_job_object; #endif @@ -1554,7 +1554,7 @@ struct jobvar_S #ifdef UNIX char_u *jv_termsig; /* allocated */ #endif -#ifdef WIN3264 +#ifdef MSWIN char_u *jv_tty_type; // allocated #endif int jv_exitval; @@ -1670,7 +1670,7 @@ typedef struct { * message when the deadline was set. If it gets longer (something was * received) the deadline is reset. */ size_t ch_wait_len; -#ifdef WIN32 +#ifdef MSWIN DWORD ch_deadline; #else struct timeval ch_deadline; @@ -1720,7 +1720,7 @@ struct channel_S { /* callback for Netbeans when channel is * closed */ -#ifdef WIN32 +#ifdef MSWIN int ch_named_pipe; /* using named pipe instead of pty */ #endif char_u *ch_callback; /* call when any msg is not handled */ @@ -3225,7 +3225,7 @@ struct VimMenu #ifdef FEAT_BEVAL_TIP BalloonEval *tip; /* tooltip for this menu item */ #endif -#ifdef FEAT_GUI_W32 +#ifdef FEAT_GUI_MSWIN UINT id; /* Id of menu item */ HMENU submenu_id; /* If this is submenu, add children here */ HWND tearoff_handle; /* hWnd of tearoff if created */ |