From: Bram Moolenaar Date: Sat, 18 Aug 2007 15:00:42 +0000 (+0000) Subject: updated for version 7.1-080 X-Git-Tag: v7.1.080 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7baa45dbbfd22f15db7c312d2fef40d1d3c9a92a;p=vim updated for version 7.1-080 --- diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp index a18eb0bbb..aa99164b2 100644 --- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -69,14 +69,14 @@ getGvimName(char *name, int runtime) // Registry didn't work, use the search path. if (name[0] == 0) - strcpy(name, searchpath("gvim.exe")); + strcpy(name, searchpath((char *)"gvim.exe")); if (!runtime) { // Only when looking for the executable, not the runtime dir, we can // search for the batch file or a name without a path. if (name[0] == 0) - strcpy(name, searchpath("gvim.bat")); + strcpy(name, searchpath((char *)"gvim.bat")); if (name[0] == 0) strcpy(name, "gvim"); // finds gvim.bat or gvim.exe @@ -152,9 +152,9 @@ dyn_libintl_init(char *dir) FARPROC *ptr; } libintl_entry[] = { - {"gettext", (FARPROC*)&dyn_libintl_gettext}, - {"textdomain", (FARPROC*)&dyn_libintl_textdomain}, - {"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, + {(char *)"gettext", (FARPROC*)&dyn_libintl_gettext}, + {(char *)"textdomain", (FARPROC*)&dyn_libintl_textdomain}, + {(char *)"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, {NULL, NULL} }; @@ -835,7 +835,7 @@ searchpath(char *name) (LPTSTR)location) > (HINSTANCE)32) return location; } - return ""; + return (char *)""; } # endif #endif diff --git a/src/version.c b/src/version.c index 11d944352..33bbc7d9b 100644 --- a/src/version.c +++ b/src/version.c @@ -666,6 +666,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 80, /**/ 79, /**/