Mercurial > vim

comparison src/proto.h @ 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 a6ca8cf07a98
children ac080f6a4db8
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
36 # include "os_amiga.pro" 36 # include "os_amiga.pro"
37 # endif 37 # endif
38 # if defined(UNIX) || defined(VMS) 38 # if defined(UNIX) || defined(VMS)
39 # include "os_unix.pro" 39 # include "os_unix.pro"
40 # endif 40 # endif
41 # ifdef WIN3264 41 # ifdef MSWIN
42 # include "os_win32.pro" 42 # include "os_win32.pro"
43 # include "os_mswin.pro" 43 # include "os_mswin.pro"
44 # include "winclip.pro" 44 # include "winclip.pro"
45 # if (defined(__GNUC__) && !defined(__MINGW32__)) \ 45 # if (defined(__GNUC__) && !defined(__MINGW32__)) \
46 || (defined(__BORLANDC__) && __BORLANDC__ < 0x502) 46 || (defined(__BORLANDC__) && __BORLANDC__ < 0x502)
264 extern int putenv(const char *string); /* in misc2.c */ 264 extern int putenv(const char *string); /* in misc2.c */
265 # ifdef USE_VIMPTY_GETENV 265 # ifdef USE_VIMPTY_GETENV
266 extern char_u *vimpty_getenv(const char_u *string); /* in misc2.c */ 266 extern char_u *vimpty_getenv(const char_u *string); /* in misc2.c */
267 # endif 267 # endif
268 # endif 268 # endif
269 # ifdef FEAT_GUI_W32 269 # ifdef FEAT_GUI_MSWIN
270 # include "gui_w32.pro" 270 # include "gui_w32.pro"
271 # endif 271 # endif
272 # ifdef FEAT_GUI_GTK 272 # ifdef FEAT_GUI_GTK
273 # include "gui_gtk.pro" 273 # include "gui_gtk.pro"
274 # include "gui_gtk_x11.pro" 274 # include "gui_gtk_x11.pro"