Mercurial > vim
comparison src/os_mswin.c @ 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 | 9745c25da3bc |
children | 8f4eccaaf2c0 |
comparison
equal
deleted
inserted
replaced
15867:4a3823e692d3 | 15868:7fad90423bd2 |
---|---|
30 #else | 30 #else |
31 # include <direct.h> | 31 # include <direct.h> |
32 #endif | 32 #endif |
33 | 33 |
34 #ifndef PROTO | 34 #ifndef PROTO |
35 # if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32) | 35 # if defined(FEAT_TITLE) && !defined(FEAT_GUI_MSWIN) |
36 # include <shellapi.h> | 36 # include <shellapi.h> |
37 # endif | 37 # endif |
38 | 38 |
39 # if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) | 39 # if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT) |
40 # include <dlgs.h> | 40 # include <dlgs.h> |
3089 enc_to_acp(name, (int)STRLEN(name), &acpname, &len); | 3089 enc_to_acp(name, (int)STRLEN(name), &acpname, &len); |
3090 name = acpname; | 3090 name = acpname; |
3091 } | 3091 } |
3092 if (STRCMP(name, "*") == 0) | 3092 if (STRCMP(name, "*") == 0) |
3093 { | 3093 { |
3094 #if defined(FEAT_GUI_W32) | 3094 #if defined(FEAT_GUI_MSWIN) |
3095 CHOOSEFONT cf; | 3095 CHOOSEFONT cf; |
3096 /* if name is "*", bring up std font dialog: */ | 3096 /* if name is "*", bring up std font dialog: */ |
3097 vim_memset(&cf, 0, sizeof(cf)); | 3097 vim_memset(&cf, 0, sizeof(cf)); |
3098 cf.lStructSize = sizeof(cf); | 3098 cf.lStructSize = sizeof(cf); |
3099 cf.hwndOwner = s_hwnd; | 3099 cf.hwndOwner = s_hwnd; |