Mercurial > vim

comparison src/version.c @ 15868:7fad90423bd2 v8.1.0941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6ddcd10aa7af
children df0426d67bb3
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
220 #ifdef FEAT_DIGRAPHS 220 #ifdef FEAT_DIGRAPHS
221 "+digraphs", 221 "+digraphs",
222 #else 222 #else
223 "-digraphs", 223 "-digraphs",
224 #endif 224 #endif
225 #ifdef FEAT_GUI_W32 225 #ifdef FEAT_GUI_MSWIN
226 # ifdef FEAT_DIRECTX 226 # ifdef FEAT_DIRECTX
227 "+directx", 227 "+directx",
228 # else 228 # else
229 "-directx", 229 "-directx",
230 # endif 230 # endif
479 #ifdef FEAT_NUM64 479 #ifdef FEAT_NUM64
480 "+num64", 480 "+num64",
481 #else 481 #else
482 "-num64", 482 "-num64",
483 #endif 483 #endif
484 #ifdef FEAT_GUI_W32 484 #ifdef FEAT_GUI_MSWIN
485 # ifdef FEAT_OLE 485 # ifdef FEAT_OLE
486 "+ole", 486 "+ole",
487 # else 487 # else
488 "-ole", 488 "-ole",
489 # endif 489 # endif
698 "+viminfo", 698 "+viminfo",
699 #else 699 #else
700 "-viminfo", 700 "-viminfo",
701 #endif 701 #endif
702 "+vreplace", 702 "+vreplace",
703 #ifdef WIN3264 703 #ifdef MSWIN
704 # ifdef FEAT_VTP 704 # ifdef FEAT_VTP
705 "+vtp", 705 "+vtp",
706 # else 706 # else
707 "-vtp", 707 "-vtp",
708 # endif 708 # endif
738 #ifdef FEAT_XIM 738 #ifdef FEAT_XIM
739 "+xim", 739 "+xim",
740 #else 740 #else
741 "-xim", 741 "-xim",
742 #endif 742 #endif
743 #ifdef WIN3264 743 #ifdef MSWIN
744 # ifdef FEAT_XPM_W32 744 # ifdef FEAT_XPM_W32
745 "+xpm_w32", 745 "+xpm_w32",
746 # else 746 # else
747 "-xpm_w32", 747 "-xpm_w32",
748 # endif 748 # endif
777 NULL 777 NULL
778 }; 778 };
779 779
780 static int included_patches[] = 780 static int included_patches[] =
781 { /* Add new patch number below this line */ 781 { /* Add new patch number below this line */
782 /**/
783 941,
782 /**/ 784 /**/
783 940, 785 940,
784 /**/ 786 /**/
785 939, 787 939,
786 /**/ 788 /**/
2850 * When adding features here, don't forget to update the list of 2852 * When adding features here, don't forget to update the list of
2851 * internal variables in eval.c! 2853 * internal variables in eval.c!
2852 */ 2854 */
2853 init_longVersion(); 2855 init_longVersion();
2854 msg(longVersion); 2856 msg(longVersion);
2855 #ifdef WIN3264 2857 #ifdef MSWIN
2856 # ifdef FEAT_GUI_W32 2858 # ifdef FEAT_GUI_MSWIN
2857 # ifdef _WIN64 2859 # ifdef _WIN64
2858 msg_puts(_("\nMS-Windows 64-bit GUI version")); 2860 msg_puts(_("\nMS-Windows 64-bit GUI version"));
2859 # else 2861 # else
2860 msg_puts(_("\nMS-Windows 32-bit GUI version")); 2862 msg_puts(_("\nMS-Windows 32-bit GUI version"));
2861 # endif 2863 # endif
2862 # ifdef FEAT_OLE 2864 # ifdef FEAT_OLE
2863 msg_puts(_(" with OLE support")); 2865 msg_puts(_(" with OLE support"));
2864 # endif 2866 # endif
2865 # else 2867 # else
2866 # ifdef _WIN64 2868 # ifdef _WIN64
2867 msg_puts(_("\nMS-Windows 64-bit console version")); 2869 msg_puts(_("\nMS-Windows 64-bit console version"));
2868 # else 2870 # else
2869 msg_puts(_("\nMS-Windows 32-bit console version")); 2871 msg_puts(_("\nMS-Windows 32-bit console version"));