summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-12 20:58:11 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-12 20:58:11 +0100
commitc19e1d1ba52e4f19f7fd03b45ea236808a754b92 (patch)
tree632d78194e52c308d4e945e7bf3e43904ef2a507
parentc6f9f739d32084923c3031cbf6f581f8c8bf7fd2 (diff)
downloadvim-git-8.0.1506.tar.gz
patch 8.0.1506: new version of HP NonStop (Tandem) doesn't like a headerv8.0.1506
Problem: New version of HP NonStop (Tandem) doesn't like the default header for setenv(). Solution: Put a #ifdef around the setenv() entry. (Joachim Schmitz)
-rw-r--r--src/osdef2.h.in4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/osdef2.h.in b/src/osdef2.h.in
index 330a5a4f5..f29451ddf 100644
--- a/src/osdef2.h.in
+++ b/src/osdef2.h.in
@@ -8,7 +8,11 @@ extern int free(char *);
extern char *malloc(unsigned int);
extern char *realloc(char *, int);
extern char *getenv(char *);
+#ifndef __TANDEM
extern int setenv(char *, char *, int);
+#else
+extern int setenv(const char *, const char *, int);
+#endif
extern int putenv(const char *);
#ifndef __TANDEM
diff --git a/src/version.c b/src/version.c
index cb7ba1896..afe8b2413 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1506,
+/**/
1505,
/**/
1504,