thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.188

Browse Source 
Problem:    SIZEOF_LONG clashes with similar defines in header files.
Solution:   Rename to a name starting with VIM_.  Also for SIZEOF_INT.
This commit is contained in:
Bram Moolenaar
2014-02-23 22:52:40 +01:00
parent 7d311c52ce
commit a2aa31a926
15 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature.h
View File

@@ -328,7 +328,7 @@
*
* Disabled for EBCDIC as it requires multibyte.
*/
#if defined(FEAT_BIG) && !defined(WIN16) && SIZEOF_INT >= 4 && !defined(EBCDIC)
#if defined(FEAT_BIG) && !defined(WIN16) && VIM_SIZEOF_INT >= 4 && !defined(EBCDIC)
# define FEAT_ARABIC
#endif
#ifdef FEAT_ARABIC
@@ -640,7 +640,7 @@
*/
#if (defined(FEAT_NORMAL) || defined(FEAT_GUI_GTK) || defined(FEAT_ARABIC)) \
&& !defined(FEAT_MBYTE) && !defined(WIN16) \
&& SIZEOF_INT >= 4 && !defined(EBCDIC)
&& VIM_SIZEOF_INT >= 4 && !defined(EBCDIC)
# define FEAT_MBYTE
#endif
@@ -661,7 +661,7 @@
# define FEAT_MBYTE
#endif
#if defined(FEAT_MBYTE) && SIZEOF_INT < 4 && !defined(PROTO)
#if defined(FEAT_MBYTE) && VIM_SIZEOF_INT < 4 && !defined(PROTO)
Error: Can only handle multi-byte feature with 32 bit int or larger
#endif