summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_os2_cfg.h3
-rw-r--r--src/os_unix.c3
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h2
4 files changed, 8 insertions, 2 deletions
diff --git a/src/os_os2_cfg.h b/src/os_os2_cfg.h
index ce3b4bbde..62527a9f6 100644
--- a/src/os_os2_cfg.h
+++ b/src/os_os2_cfg.h
@@ -183,6 +183,9 @@
/* Define if you have the ANSI C header files. */
/* #undef STDC_HEADERS */
+/* added by David Sanders */
+#define HAVE_STDARG_H 1
+
/* instead, we check a few STDC things ourselves */
#define HAVE_STDLIB_H 1
#undef HAVE_STRING_H /* On EMX it is better to use strings.h */
diff --git a/src/os_unix.c b/src/os_unix.c
index b3754689d..86f52c54e 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4971,7 +4971,8 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
if (((*file)[*num_file] = alloc(len + 2)) != NULL)
{
STRCPY((*file)[*num_file], p);
- if (!after_pathsep((*file)[*num_file] + len))
+ if (!after_pathsep((*file)[*num_file],
+ (*file)[*num_file] + len))
{
(*file)[*num_file][len] = psepc;
(*file)[*num_file][len + 1] = NUL;
diff --git a/src/version.c b/src/version.c
index be2baf468..0b0703c56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 28,
+/**/
27,
/**/
26,
diff --git a/src/vim.h b/src/vim.h
index 3ee12bf69..a72e65556 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1983,7 +1983,7 @@ typedef int proftime_T; /* dummy for function prototypes */
/* values for vim_handle_signal() that are not a signal */
#define SIGNAL_BLOCK -1
#define SIGNAL_UNBLOCK -2
-#if !defined(UNIX) && !defined(VMS)
+#if !defined(UNIX) && !defined(VMS) && !defined(OS2)
# define vim_handle_signal(x) 0
#endif