diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-08-18 15:00:42 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-08-18 15:00:42 +0000 |
| commit | 7baa45dbbfd22f15db7c312d2fef40d1d3c9a92a (patch) | |
| tree | 54cb484ecf77407f3eadf237c5c8a364b83fb1f1 | |
| parent | deefb63bfbf7bba981e82853638f9ab98d947d80 (diff) | |
| download | vim-git-7baa45dbbfd22f15db7c312d2fef40d1d3c9a92a.tar.gz | |
updated for version 7.1-080v7.1.080
| -rw-r--r-- | src/GvimExt/gvimext.cpp | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 80, +/**/ 79, /**/ 78, |