Mercurial > vim

comparison src/feature.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 6f1c7e9a6393
children 00ba42122944
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
59 * Use +big for older systems: Other MS-Windows and VMS. 59 * Use +big for older systems: Other MS-Windows and VMS.
60 * Otherwise use +normal 60 * Otherwise use +normal
61 */ 61 */
62 #if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ 62 #if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \
63 && !defined(FEAT_BIG) && !defined(FEAT_HUGE) 63 && !defined(FEAT_BIG) && !defined(FEAT_HUGE)
64 # if defined(UNIX) || defined(WIN3264) || defined(MACOS_X) 64 # if defined(UNIX) || defined(MSWIN) || defined(MACOS_X)
65 # define FEAT_HUGE 65 # define FEAT_HUGE
66 # else 66 # else
67 # if defined(MSWIN) || defined(VMS) || defined(AMIGA) 67 # if defined(MSWIN) || defined(VMS) || defined(AMIGA)
68 # define FEAT_BIG 68 # define FEAT_BIG
69 # else 69 # else
341 * +float Floating point variables. 341 * +float Floating point variables.
342 * +num64 64-bit Number. 342 * +num64 64-bit Number.
343 */ 343 */
344 #ifdef FEAT_NORMAL 344 #ifdef FEAT_NORMAL
345 # define FEAT_EVAL 345 # define FEAT_EVAL
346 # if defined(HAVE_FLOAT_FUNCS) || defined(WIN3264) || defined(MACOS_X) 346 # if defined(HAVE_FLOAT_FUNCS) || defined(MSWIN) || defined(MACOS_X)
347 # define FEAT_FLOAT 347 # define FEAT_FLOAT
348 # endif 348 # endif
349 # if defined(HAVE_STDINT_H) || defined(WIN3264) || (VIM_SIZEOF_LONG >= 8) 349 # if defined(HAVE_STDINT_H) || defined(MSWIN) || (VIM_SIZEOF_LONG >= 8)
350 # define FEAT_NUM64 350 # define FEAT_NUM64
351 # endif 351 # endif
352 #endif 352 #endif
353 353
354 #ifdef FEAT_EVAL 354 #ifdef FEAT_EVAL
359 * +profile Profiling for functions and scripts. 359 * +profile Profiling for functions and scripts.
360 */ 360 */
361 #if defined(FEAT_HUGE) \ 361 #if defined(FEAT_HUGE) \
362 && defined(FEAT_EVAL) \ 362 && defined(FEAT_EVAL) \
363 && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ 363 && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
364 || defined(WIN3264)) 364 || defined(MSWIN))
365 # define FEAT_PROFILE 365 # define FEAT_PROFILE
366 #endif 366 #endif
367 367
368 /* 368 /*
369 * +reltime reltime() function 369 * +reltime reltime() function
370 */ 370 */
371 #if defined(FEAT_NORMAL) \ 371 #if defined(FEAT_NORMAL) \
372 && defined(FEAT_EVAL) \ 372 && defined(FEAT_EVAL) \
373 && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ 373 && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
374 || defined(WIN3264)) 374 || defined(MSWIN))
375 # define FEAT_RELTIME 375 # define FEAT_RELTIME
376 #endif 376 #endif
377 377
378 /* 378 /*
379 * +timers timer_start() 379 * +timers timer_start()
380 */ 380 */
381 #if defined(FEAT_RELTIME) && (defined(UNIX) || defined(WIN32) || defined(VMS) ) 381 #if defined(FEAT_RELTIME) && (defined(UNIX) || defined(MSWIN) || defined(VMS) )
382 # define FEAT_TIMERS 382 # define FEAT_TIMERS
383 #endif 383 #endif
384 384
385 /* 385 /*
386 * +textobjects Text objects: "vaw", "das", etc. 386 * +textobjects Text objects: "vaw", "das", etc.
601 601
602 /* 602 /*
603 * +multi_byte_ime Win32 IME input method. Only for far-east Windows, so 603 * +multi_byte_ime Win32 IME input method. Only for far-east Windows, so
604 * IME can be used to input chars. Not tested much! 604 * IME can be used to input chars. Not tested much!
605 */ 605 */
606 #if defined(FEAT_GUI_W32) && !defined(FEAT_MBYTE_IME) 606 #if defined(FEAT_GUI_MSWIN) && !defined(FEAT_MBYTE_IME)
607 /* #define FEAT_MBYTE_IME */ 607 /* #define FEAT_MBYTE_IME */
608 # endif 608 # endif
609 609
610 /* Use iconv() when it's available. */ 610 /* Use iconv() when it's available. */
611 #if (defined(HAVE_ICONV_H) && defined(HAVE_ICONV)) || defined(DYNAMIC_ICONV) 611 #if (defined(HAVE_ICONV_H) && defined(HAVE_ICONV)) || defined(DYNAMIC_ICONV)
657 */ 657 */
658 /* Using dlopen() also requires dlsym() to be available. */ 658 /* Using dlopen() also requires dlsym() to be available. */
659 #if defined(HAVE_DLOPEN) && defined(HAVE_DLSYM) 659 #if defined(HAVE_DLOPEN) && defined(HAVE_DLSYM)
660 # define USE_DLOPEN 660 # define USE_DLOPEN
661 #endif 661 #endif
662 #if defined(FEAT_EVAL) && (defined(WIN3264) || ((defined(UNIX) || defined(VMS)) \ 662 #if defined(FEAT_EVAL) && (defined(MSWIN) || ((defined(UNIX) || defined(VMS)) \
663 && (defined(USE_DLOPEN) || defined(HAVE_SHL_LOAD)))) 663 && (defined(USE_DLOPEN) || defined(HAVE_SHL_LOAD))))
664 # define FEAT_LIBCALL 664 # define FEAT_LIBCALL
665 #endif 665 #endif
666 666
667 /* 667 /*
668 * +menu ":menu" command 668 * +menu ":menu" command
669 */ 669 */
670 #ifdef FEAT_NORMAL 670 #ifdef FEAT_NORMAL
671 # define FEAT_MENU 671 # define FEAT_MENU
672 # ifdef FEAT_GUI_W32 672 # ifdef FEAT_GUI_MSWIN
673 # define FEAT_TEAROFF 673 # define FEAT_TEAROFF
674 # endif 674 # endif
675 #endif 675 #endif
676 676
677 /* 677 /*
755 # define FEAT_CON_DIALOG 755 # define FEAT_CON_DIALOG
756 # endif 756 # endif
757 #endif 757 #endif
758 #if !defined(FEAT_GUI_DIALOG) && (defined(FEAT_GUI_MOTIF) \ 758 #if !defined(FEAT_GUI_DIALOG) && (defined(FEAT_GUI_MOTIF) \
759 || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ 759 || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \
760 || defined(FEAT_GUI_W32)) 760 || defined(FEAT_GUI_MSWIN))
761 /* need a dialog to show error messages when starting from the desktop */ 761 /* need a dialog to show error messages when starting from the desktop */
762 # define FEAT_GUI_DIALOG 762 # define FEAT_GUI_DIALOG
763 #endif 763 #endif
764 #if defined(FEAT_GUI_DIALOG) && \ 764 #if defined(FEAT_GUI_DIALOG) && \
765 (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ 765 (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
826 * STARTUPTIME Time the startup process. Writes a file with 826 * STARTUPTIME Time the startup process. Writes a file with
827 * timestamps. 827 * timestamps.
828 */ 828 */
829 #if defined(FEAT_NORMAL) \ 829 #if defined(FEAT_NORMAL) \
830 && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \ 830 && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
831 || defined(WIN3264)) 831 || defined(MSWIN))
832 # define STARTUPTIME 1 832 # define STARTUPTIME 1
833 #endif 833 #endif
834 834
835 /* 835 /*
836 * MEM_PROFILE Debugging of memory allocation and freeing. 836 * MEM_PROFILE Debugging of memory allocation and freeing.
1037 # define FEAT_MOUSE_URXVT 1037 # define FEAT_MOUSE_URXVT
1038 # endif 1038 # endif
1039 # ifdef FEAT_BIG 1039 # ifdef FEAT_BIG
1040 # define FEAT_MOUSE_SGR 1040 # define FEAT_MOUSE_SGR
1041 # endif 1041 # endif
1042 # if defined(FEAT_NORMAL) && defined(WIN3264) 1042 # if defined(FEAT_NORMAL) && defined(MSWIN)
1043 # define DOS_MOUSE 1043 # define DOS_MOUSE
1044 # endif 1044 # endif
1045 # if defined(FEAT_NORMAL) && defined(__QNX__) 1045 # if defined(FEAT_NORMAL) && defined(__QNX__)
1046 # define FEAT_MOUSE_PTERM 1046 # define FEAT_MOUSE_PTERM
1047 # endif 1047 # endif
1134 1134
1135 /* 1135 /*
1136 * +clientserver Remote control via the remote_send() function 1136 * +clientserver Remote control via the remote_send() function
1137 * and the --remote argument 1137 * and the --remote argument
1138 */ 1138 */
1139 #if (defined(WIN32) || defined(FEAT_XCLIPBOARD)) && defined(FEAT_EVAL) 1139 #if (defined(MSWIN) || defined(FEAT_XCLIPBOARD)) && defined(FEAT_EVAL)
1140 # define FEAT_CLIENTSERVER 1140 # define FEAT_CLIENTSERVER
1141 #endif 1141 #endif
1142 1142
1143 /* 1143 /*
1144 * +autoservername Automatically generate a servername for clientserver 1144 * +autoservername Automatically generate a servername for clientserver
1145 * when --servername is not passed on the command line. 1145 * when --servername is not passed on the command line.
1146 */ 1146 */
1147 #if defined(FEAT_CLIENTSERVER) && !defined(FEAT_AUTOSERVERNAME) 1147 #if defined(FEAT_CLIENTSERVER) && !defined(FEAT_AUTOSERVERNAME)
1148 # ifdef WIN3264 1148 # ifdef MSWIN
1149 /* Always enabled on MS-Windows. */ 1149 /* Always enabled on MS-Windows. */
1150 # define FEAT_AUTOSERVERNAME 1150 # define FEAT_AUTOSERVERNAME
1151 # else 1151 # else
1152 /* Enable here if you don't use configure. */ 1152 /* Enable here if you don't use configure. */
1153 /* # define FEAT_AUTOSERVERNAME */ 1153 /* # define FEAT_AUTOSERVERNAME */
1167 * cursor shape Adjust the shape of the cursor to the mode. 1167 * cursor shape Adjust the shape of the cursor to the mode.
1168 * mouse shape Adjust the shape of the mouse pointer to the mode. 1168 * mouse shape Adjust the shape of the mouse pointer to the mode.
1169 */ 1169 */
1170 #ifdef FEAT_NORMAL 1170 #ifdef FEAT_NORMAL
1171 /* MS-DOS console and Win32 console can change cursor shape */ 1171 /* MS-DOS console and Win32 console can change cursor shape */
1172 # if defined(WIN3264) && !defined(FEAT_GUI_W32) 1172 # if defined(MSWIN) && !defined(FEAT_GUI_MSWIN)
1173 # define MCH_CURSOR_SHAPE 1173 # define MCH_CURSOR_SHAPE
1174 # endif 1174 # endif
1175 # if defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ 1175 # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \
1176 || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \ 1176 || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) \
1177 || defined(FEAT_GUI_PHOTON) 1177 || defined(FEAT_GUI_PHOTON)
1178 # define FEAT_MOUSESHAPE 1178 # define FEAT_MOUSESHAPE
1179 # endif 1179 # endif
1180 #endif 1180 #endif
1187 || defined(FEAT_CONCEAL) \ 1187 || defined(FEAT_CONCEAL) \
1188 || (defined(UNIX) && defined(FEAT_NORMAL)) 1188 || (defined(UNIX) && defined(FEAT_NORMAL))
1189 # define CURSOR_SHAPE 1189 # define CURSOR_SHAPE
1190 #endif 1190 #endif
1191 1191
1192 #if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_GTK) \ 1192 #if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \
1193 || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ 1193 || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
1194 || defined(FEAT_GUI_MAC)) 1194 || defined(FEAT_GUI_MAC))
1195 # define MZSCHEME_GUI_THREADS 1195 # define MZSCHEME_GUI_THREADS
1196 #endif 1196 #endif
1197 1197
1261 #if defined(FEAT_BIG) || defined(FEAT_NETBEANS_INTG) 1261 #if defined(FEAT_BIG) || defined(FEAT_NETBEANS_INTG)
1262 # define FEAT_SIGNS 1262 # define FEAT_SIGNS
1263 # if ((defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \ 1263 # if ((defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) \
1264 && defined(HAVE_X11_XPM_H)) \ 1264 && defined(HAVE_X11_XPM_H)) \
1265 || defined(FEAT_GUI_GTK) \ 1265 || defined(FEAT_GUI_GTK) \
1266 || (defined(WIN32) && defined(FEAT_GUI)) 1266 || (defined(MSWIN) && defined(FEAT_GUI))
1267 # define FEAT_SIGN_ICONS 1267 # define FEAT_SIGN_ICONS
1268 # endif 1268 # endif
1269 #endif 1269 #endif
1270 1270
1271 /* 1271 /*
1272 * +balloon_eval Allow balloon expression evaluation. Used with a 1272 * +balloon_eval Allow balloon expression evaluation. Used with a
1273 * debugger and for tooltips. 1273 * debugger and for tooltips.
1274 * Only for GUIs where it was implemented. 1274 * Only for GUIs where it was implemented.
1275 */ 1275 */
1276 #if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ 1276 #if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
1277 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32)) \ 1277 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN)) \
1278 && ( ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \ 1278 && ( ((defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE)) \
1279 && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)) \ 1279 && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN)) \
1280 || defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL)) 1280 || defined(FEAT_NETBEANS_INTG) || defined(FEAT_EVAL))
1281 # define FEAT_BEVAL_GUI 1281 # define FEAT_BEVAL_GUI
1282 # if !defined(FEAT_XFONTSET) && !defined(FEAT_GUI_GTK) \ 1282 # if !defined(FEAT_XFONTSET) && !defined(FEAT_GUI_GTK) \
1283 && !defined(FEAT_GUI_W32) 1283 && !defined(FEAT_GUI_MSWIN)
1284 # define FEAT_XFONTSET 1284 # define FEAT_XFONTSET
1285 # endif 1285 # endif
1286 #endif 1286 #endif
1287 1287
1288 #if defined(FEAT_BEVAL_GUI) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) 1288 #if defined(FEAT_BEVAL_GUI) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA))
1291 1291
1292 /* 1292 /*
1293 * +balloon_eval_term Allow balloon expression evaluation in the terminal. 1293 * +balloon_eval_term Allow balloon expression evaluation in the terminal.
1294 */ 1294 */
1295 #if defined(FEAT_HUGE) && defined(FEAT_TIMERS) && \ 1295 #if defined(FEAT_HUGE) && defined(FEAT_TIMERS) && \
1296 (defined(UNIX) || defined(VMS) || (defined(WIN32) && !defined(FEAT_GUI_W32))) 1296 (defined(UNIX) || defined(VMS) || (defined(MSWIN) && !defined(FEAT_GUI_MSWIN)))
1297 # define FEAT_BEVAL_TERM 1297 # define FEAT_BEVAL_TERM
1298 #endif 1298 #endif
1299 1299
1300 #if defined(FEAT_BEVAL_GUI) || defined(FEAT_BEVAL_TERM) 1300 #if defined(FEAT_BEVAL_GUI) || defined(FEAT_BEVAL_TERM)
1301 # define FEAT_BEVAL 1301 # define FEAT_BEVAL
1338 1338
1339 /* 1339 /*
1340 * +filterpipe 1340 * +filterpipe
1341 */ 1341 */
1342 #if (defined(UNIX) && !defined(USE_SYSTEM)) \ 1342 #if (defined(UNIX) && !defined(USE_SYSTEM)) \
1343 || (defined(WIN3264) && defined(FEAT_GUI_W32)) 1343 || (defined(MSWIN) && defined(FEAT_GUI_MSWIN))
1344 # define FEAT_FILTERPIPE 1344 # define FEAT_FILTERPIPE
1345 #endif 1345 #endif
1346 1346
1347 /* 1347 /*
1348 * +vtp: Win32 virtual console. 1348 * +vtp: Win32 virtual console.
1349 */ 1349 */
1350 #if !defined(FEAT_GUI) && defined(WIN3264) 1350 #if !defined(FEAT_GUI) && defined(MSWIN)
1351 # define FEAT_VTP 1351 # define FEAT_VTP
1352 #endif 1352 #endif