Mercurial > vim

comparison src/globals.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 ddd82b1c9e9d
comparison
equal deleted inserted replaced
15867:4a3823e692d3 15868:7fad90423bd2
17 * They may have different values when the screen wasn't (re)allocated yet 17 * They may have different values when the screen wasn't (re)allocated yet
18 * after setting Rows or Columns (e.g., when starting up). 18 * after setting Rows or Columns (e.g., when starting up).
19 */ 19 */
20 EXTERN long Rows /* nr of rows in the screen */ 20 EXTERN long Rows /* nr of rows in the screen */
21 #ifdef DO_INIT 21 #ifdef DO_INIT
22 # if defined(WIN3264) 22 # if defined(MSWIN)
23 = 25L 23 = 25L
24 # else 24 # else
25 = 24L 25 = 24L
26 # endif 26 # endif
27 #endif 27 #endif
816 EXTERN int enc_dbcs INIT(= 0); /* One of DBCS_xxx values if 816 EXTERN int enc_dbcs INIT(= 0); /* One of DBCS_xxx values if
817 DBCS encoding */ 817 DBCS encoding */
818 EXTERN int enc_unicode INIT(= 0); /* 2: UCS-2 or UTF-16, 4: UCS-4 */ 818 EXTERN int enc_unicode INIT(= 0); /* 2: UCS-2 or UTF-16, 4: UCS-4 */
819 EXTERN int enc_utf8 INIT(= FALSE); /* UTF-8 encoded Unicode */ 819 EXTERN int enc_utf8 INIT(= FALSE); /* UTF-8 encoded Unicode */
820 EXTERN int enc_latin1like INIT(= TRUE); /* 'encoding' is latin1 comp. */ 820 EXTERN int enc_latin1like INIT(= TRUE); /* 'encoding' is latin1 comp. */
821 #if defined(WIN3264) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD) 821 #if defined(MSWIN) || defined(FEAT_CYGWIN_WIN32_CLIPBOARD)
822 /* Codepage nr of 'encoding'. Negative means it's not been set yet, zero 822 /* Codepage nr of 'encoding'. Negative means it's not been set yet, zero
823 * means 'encoding' is not a valid codepage. */ 823 * means 'encoding' is not a valid codepage. */
824 EXTERN int enc_codepage INIT(= -1); 824 EXTERN int enc_codepage INIT(= -1);
825 EXTERN int enc_latin9 INIT(= FALSE); /* 'encoding' is latin9 */ 825 EXTERN int enc_latin9 INIT(= FALSE); /* 'encoding' is latin9 */
826 #endif 826 #endif
827 EXTERN int has_mbyte INIT(= 0); /* any multi-byte encoding */ 827 EXTERN int has_mbyte INIT(= 0); /* any multi-byte encoding */
828 828
829 #if defined(WIN3264) 829 #if defined(MSWIN)
830 EXTERN int wide_WindowProc INIT(= FALSE); /* use wide WindowProc() */ 830 EXTERN int wide_WindowProc INIT(= FALSE); /* use wide WindowProc() */
831 #endif 831 #endif
832 832
833 /* 833 /*
834 * To speed up BYTELEN() we fill a table with the byte lengths whenever 834 * To speed up BYTELEN() we fill a table with the byte lengths whenever
1294 #ifdef FEAT_GUI_GTK 1294 #ifdef FEAT_GUI_GTK
1295 EXTERN guint32 gtk_socket_id INIT(= 0); 1295 EXTERN guint32 gtk_socket_id INIT(= 0);
1296 EXTERN int echo_wid_arg INIT(= FALSE); /* --echo-wid argument */ 1296 EXTERN int echo_wid_arg INIT(= FALSE); /* --echo-wid argument */
1297 #endif 1297 #endif
1298 1298
1299 #ifdef FEAT_GUI_W32 1299 #ifdef FEAT_GUI_MSWIN
1300 /* 1300 /*
1301 * The value of the --windowid argument. 1301 * The value of the --windowid argument.
1302 * For embedding gvim inside another application. 1302 * For embedding gvim inside another application.
1303 */ 1303 */
1304 EXTERN long_u win_socket_id INIT(= 0); 1304 EXTERN long_u win_socket_id INIT(= 0);
1643 1643
1644 /* Used for checking if local variables or arguments used in a lambda. */ 1644 /* Used for checking if local variables or arguments used in a lambda. */
1645 EXTERN int *eval_lavars_used INIT(= NULL); 1645 EXTERN int *eval_lavars_used INIT(= NULL);
1646 #endif 1646 #endif
1647 1647
1648 #ifdef WIN3264 1648 #ifdef MSWIN
1649 EXTERN int ctrl_break_was_pressed INIT(= FALSE); 1649 EXTERN int ctrl_break_was_pressed INIT(= FALSE);
1650 #endif 1650 #endif
1651 1651
1652 #ifdef FEAT_TEXT_PROP 1652 #ifdef FEAT_TEXT_PROP
1653 EXTERN int text_prop_frozen INIT(= 0); 1653 EXTERN int text_prop_frozen INIT(= 0);