diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-02-23 22:52:40 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-02-23 22:52:40 +0100 |
commit | a2aa31a9269641839178b0c0663dc67405c33d3e (patch) | |
tree | fba5b26febe0f352a4ad0a9cace397f479ced86c /src/feature.h | |
parent | 7d311c52ce2859f67532e0a4b604eb8147473c01 (diff) | |
download | vim-git-a2aa31a9269641839178b0c0663dc67405c33d3e.tar.gz |
updated for version 7.4.188v7.4.188
Problem: SIZEOF_LONG clashes with similar defines in header files.
Solution: Rename to a name starting with VIM_. Also for SIZEOF_INT.
Diffstat (limited to 'src/feature.h')
-rw-r--r-- | src/feature.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/feature.h b/src/feature.h index d4b9aea75..24c408977 100644 --- a/src/feature.h +++ b/src/feature.h @@ -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 |