--- os_unix.c.orig Mon May 1 04:13:14 2006
+++ os_unix.c Wed May 17 14:31:14 2006
@@ -4971,7 +4971,7 @@ mch_expand_wildcards(num_pat, pat, num_f
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;
--- vim.h.orig Wed May 17 17:34:42 2006
+++ vim.h Wed May 17 17:35:02 2006
@@ -1983,7 +1983,7 @@ typedef int proftime_T; /* dummy for
/* 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
--- os_os2_cfg.h.orig Mon Jun 7 10:32:26 2004
+++ os_os2_cfg.h Wed May 17 13:18:28 2006
@@ -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 */