summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-23 16:52:01 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-23 16:52:01 +0100
commit2c02d3843a103826a3eb44357eaab09b7deb256b (patch)
tree73ba1097bf191846c56a304cdeb1126d311bae89
parentc2a60ae10e7badad9186de59a9994fc8c9f539e0 (diff)
downloadvim-git-2c02d3843a103826a3eb44357eaab09b7deb256b.tar.gz
patch 8.2.0145: using #error for compilation errors should be OK nowv8.2.0145
Problem: Using #error for compilation errors should be OK now. Solution: Use #error. (Ken Takata, closes #5299)
-rw-r--r--src/blowfish.c3
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/src/blowfish.c b/src/blowfish.c
index a73b3b6c5..af5e2fc00 100644
--- a/src/blowfish.c
+++ b/src/blowfish.c
@@ -40,8 +40,7 @@ typedef union {
# ifdef HAVE_CONFIG_H
// in configure.ac AC_C_BIGENDIAN() defines WORDS_BIGENDIAN when needed
# else
- error!
- Please change this code to define WORDS_BIGENDIAN for big-endian machines.
+# error Please change this code to define WORDS_BIGENDIAN for big-endian machines.
# endif
#endif
diff --git a/src/version.c b/src/version.c
index 2b0e7af4a..fda985ff3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 145,
+/**/
144,
/**/
143,
diff --git a/src/vim.h b/src/vim.h
index d41db1439..7ad55aa24 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -33,7 +33,7 @@
* test program. Other items from configure may also be wrong then!
*/
# if (VIM_SIZEOF_INT == 0)
- Error: configure did not run properly. Check auto/config.log.
+# error configure did not run properly. Check auto/config.log.
# endif
# if (defined(__linux__) && !defined(__ANDROID__)) || defined(__CYGWIN__)
@@ -148,7 +148,7 @@
#endif
#if VIM_SIZEOF_INT < 4 && !defined(PROTO)
- Error: Vim only works with 32 bit int or larger
+# error Vim only works with 32 bit int or larger
#endif
/*