summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-06-22 16:19:31 +0000
committerBram Moolenaar <Bram@vim.org>2006-06-22 16:19:31 +0000
commitb39ef128c8f848a0b76025f07569450c764eb9eb (patch)
tree0c9c62c8fcffd8432d46c961def5674ebc32f434 /src
parent9dfb0f808f85b102ac1082c9f6ae7b695e7b15cd (diff)
updated for version 7.0-026v7.0.026
Diffstat (limited to 'src')
-rw-r--r--src/os_unix.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 0059d30816..b3754689d7 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5757,8 +5757,13 @@ mch_libcall(libname, funcname, argstring, argint, string_result, number_result)
int retval_int = 0;
int success = FALSE;
- /* Get a handle to the DLL module. */
+ /*
+ * Get a handle to the DLL module.
+ */
# if defined(USE_DLOPEN)
+ /* First clear any error, it's not cleared by the dlopen() call. */
+ (void)dlerror();
+
hinstLib = dlopen((char *)libname, RTLD_LAZY
# ifdef RTLD_LOCAL
| RTLD_LOCAL
diff --git a/src/version.c b/src/version.c
index 31af61d06e..b60ede600a 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 */
/**/
+ 26,
+/**/
25,
/**/
24,