From 4f97475d326c2773a78561fb874e4f23c25cbcd9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 17 Feb 2019 17:44:42 +0100 Subject: 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) --- src/feature.h | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/feature.h') diff --git a/src/feature.h b/src/feature.h index a41e79f6f..1be1833bf 100644 --- a/src/feature.h +++ b/src/feature.h @@ -61,7 +61,7 @@ */ #if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ && !defined(FEAT_BIG) && !defined(FEAT_HUGE) -# if defined(UNIX) || defined(WIN3264) || defined(MACOS_X) +# if defined(UNIX) || defined(MSWIN) || defined(MACOS_X) # define FEAT_HUGE # else # if defined(MSWIN) || defined(VMS) || defined(AMIGA) @@ -343,10 +343,10 @@ */ #ifdef FEAT_NORMAL # define FEAT_EVAL -# if defined(HAVE_FLOAT_FUNCS) || defined(WIN3264) || defined(MACOS_X) +# if defined(HAVE_FLOAT_FUNCS) || defined(MSWIN) || defined(MACOS_X) # define FEAT_FLOAT # endif -# if defined(HAVE_STDINT_H) || defined(WIN3264) || (VIM_SIZEOF_LONG >= 8) +# if defined(HAVE_STDINT_H) || defined(MSWIN) || (VIM_SIZEOF_LONG >= 8) # define FEAT_NUM64 # endif #endif @@ -361,7 +361,7 @@ #if defined(FEAT_HUGE) \ && defined(FEAT_EVAL) \ && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ - || defined(WIN3264)) + || defined(MSWIN)) # define FEAT_PROFILE #endif @@ -371,14 +371,14 @@ #if defined(FEAT_NORMAL) \ && defined(FEAT_EVAL) \ && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ - || defined(WIN3264)) + || defined(MSWIN)) # define FEAT_RELTIME #endif /* * +timers timer_start() */ -#if defined(FEAT_RELTIME) && (defined(UNIX) || defined(WIN32) || defined(VMS) ) +#if defined(FEAT_RELTIME) && (defined(UNIX) || defined(MSWIN) || defined(VMS) ) # define FEAT_TIMERS #endif @@ -603,7 +603,7 @@ * +multi_byte_ime Win32 IME input method. Only for far-east Windows, so * IME can be used to input chars. Not tested much! */ -#if defined(FEAT_GUI_W32) && !defined(FEAT_MBYTE_IME) +#if defined(FEAT_GUI_MSWIN) && !defined(FEAT_MBYTE_IME) /* #define FEAT_MBYTE_IME */ # endif @@ -659,7 +659,7 @@ #if defined(HAVE_DLOPEN) && defined(HAVE_DLSYM) # define USE_DLOPEN #endif -#if defined(FEAT_EVAL) && (defined(WIN3264) || ((defined(UNIX) || defined(VMS)) \ +#if defined(FEAT_EVAL) && (defined(MSWIN) || ((defined(UNIX) || defined(VMS)) \ && (defined(USE_DLOPEN) || defined(HAVE_SHL_LOAD)))) # define FEAT_LIBCALL #endif @@ -669,7 +669,7 @@ */ #ifdef FEAT_NORMAL # define FEAT_MENU -# ifdef FEAT_GUI_W32 +# ifdef FEAT_GUI_MSWIN # define FEAT_TEAROFF # endif #endif @@ -757,7 +757,7 @@ #endif #if !defined(FEAT_GUI_DIALOG) && (defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ - || defined(FEAT_GUI_W32)) + || defined(FEAT_GUI_MSWIN)) /* need a dialog to show error messages when starting from the desktop */ # define FEAT_GUI_DIALOG #endif @@ -828,7 +828,7 @@ */ #if defined(FEAT_NORMAL) \ && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ - || defined(WIN3264)) + || defined(MSWIN)) # define STARTUPTIME 1 #endif @@ -1039,7 +1039,7 @@ # ifdef FEAT_BIG # define FEAT_MOUSE_SGR # endif -# if defined(FEAT_NORMAL) && defined(WIN3264) +# if defined(FEAT_NORMAL) && defined(MSWIN) # define DOS_MOUSE # endif # if defined(FEAT_NORMAL) && defined(__QNX__) @@ -1136,7 +1136,7 @@ * +clientserver Remote control via the remote_send() function * and the --remote argument */ -#if (defined(WIN32) || defined(FEAT_XCLIPBOARD)) && defined(FEAT_EVAL) +#if (defined(MSWIN) || defined(FEAT_XCLIPBOARD)) && defined(FEAT_EVAL) # define FEAT_CLIENTSERVER #endif @@ -1145,7 +1145,7 @@ * when --servername is not passed on the command line. */ #if defined(FEAT_CLIENTSERVER) && !defined(FEAT_AUTOSERVERNAME) -# ifdef WIN3264 +# ifdef MSWIN /* Always enabled on MS-Windows. */ # define FEAT_AUTOSERVERNAME # else @@ -1169,10 +1169,10 @@ */ #ifdef FEAT_NORMAL /* MS-DOS console and Win32 console can change cursor shape */ -# if defined(WIN3264) && !defined(FEAT_GUI_W32) +# if defined(MSWIN) && !defined(FEAT_GUI_MSWIN) # define MCH_CURSOR_SHAPE # endif -# if defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ +# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_PHOTON) # define FEAT_MOUSESHAPE @@ -1189,7 +1189,7 @@ # define CURSOR_SHAPE #endif -#if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_GTK) \ +#if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ || defined(FEAT_GUI_MAC)) # define MZSCHEME_GUI_THREADS @@ -1263,7 +1263,7 @@ # if ((defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \ && defined(HAVE_X11_XPM_H)) \ || defined(FEAT_GUI_GTK) \ - || (defined(WIN32) && defined(FEAT_GUI)) + || (defined(MSWIN) && defined(FEAT_GUI)) # define FEAT_SIGN_ICONS # endif #endif @@ -1274,13 +1274,13 @@ * Only for GUIs where it was implemented. */ #if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ - || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)) \ + || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN)) \ && ( ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \ - && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)) \ + && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN)) \ || defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL)) # define FEAT_BEVAL_GUI # if !defined(FEAT_XFONTSET) && !defined(FEAT_GUI_GTK) \ - && !defined(FEAT_GUI_W32) + && !defined(FEAT_GUI_MSWIN) # define FEAT_XFONTSET # endif #endif @@ -1293,7 +1293,7 @@ * +balloon_eval_term Allow balloon expression evaluation in the terminal. */ #if defined(FEAT_HUGE) && defined(FEAT_TIMERS) && \ - (defined(UNIX) || defined(VMS) || (defined(WIN32) && !defined(FEAT_GUI_W32))) + (defined(UNIX) || defined(VMS) || (defined(MSWIN) && !defined(FEAT_GUI_MSWIN))) # define FEAT_BEVAL_TERM #endif @@ -1340,13 +1340,13 @@ * +filterpipe */ #if (defined(UNIX) && !defined(USE_SYSTEM)) \ - || (defined(WIN3264) && defined(FEAT_GUI_W32)) + || (defined(MSWIN) && defined(FEAT_GUI_MSWIN)) # define FEAT_FILTERPIPE #endif /* * +vtp: Win32 virtual console. */ -#if !defined(FEAT_GUI) && defined(WIN3264) +#if !defined(FEAT_GUI) && defined(MSWIN) # define FEAT_VTP #endif -- cgit v1.2.1