]> granicus.if.org Git - vim/commitdiff
updated for version 7.1-080 v7.1.080
authorBram Moolenaar <Bram@vim.org>
Sat, 18 Aug 2007 15:00:42 +0000 (15:00 +0000)
committerBram Moolenaar <Bram@vim.org>
Sat, 18 Aug 2007 15:00:42 +0000 (15:00 +0000)
src/GvimExt/gvimext.cpp
src/version.c

index a18eb0bbb5d438078dc822dd8923adf0107fa361..aa99164b2f2351e9c38fd894b50e46bc6dd90307 100644 (file)
@@ -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
index 11d944352477d5906b486267dfad443a0b258a50..33bbc7d9be92e2bbf3ee17645297840cf3948269 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    80,
 /**/
     79,
 /**/