summaryrefslogtreecommitdiff
path: root/src/vim.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-12-03 16:40:51 +0100
committerBram Moolenaar <Bram@vim.org>2016-12-03 16:40:51 +0100
commita899e6ecc4523c7e411eaf6fbaa4197d70f6f39e (patch)
treed477a022d1581e56239dbff5de3778c9470aaee3 /src/vim.h
parent3fad98e8af247af8ebc49730646282a71ccdd47a (diff)
downloadvim-git-a899e6ecc4523c7e411eaf6fbaa4197d70f6f39e.tar.gz
patch 8.0.0123v8.0.0123
Problem: Modern Sun compilers define "__sun" instead of "sun". Solution: Use __sun. (closes #1296)
Diffstat (limited to 'src/vim.h')
-rw-r--r--src/vim.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/vim.h b/src/vim.h
index de26c63db..ef75ea2ca 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -268,6 +268,11 @@
# define UNUSED
#endif
+/* Used to check for "sun", "__sun" is used by newer compilers. */
+#if defined(__sun)
+# define SUN_SYSTEM
+#endif
+
/* if we're compiling in C++ (currently only KVim), the system
* headers must have the correct prototypes or nothing will build.
* conversely, our prototypes might clash due to throw() specifiers and
@@ -2487,7 +2492,7 @@ typedef enum
#define FNE_INCL_BR 1 /* include [] in name */
#define FNE_CHECK_START 2 /* check name starts with valid character */
-#if (defined(sun) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
+#if (defined(SUN_SYSTEM) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
&& defined(S_ISCHR)
# define OPEN_CHR_FILES
#endif