Mirror of the Vim source from https://github.com/vim/vim
Revision | 7e7da11555d27f62984297f3e1debc8242baf995 (tree) |
---|---|
Time | 2007-08-19 00:00:42 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.1-080
@@ -69,14 +69,14 @@ | ||
69 | 69 | |
70 | 70 | // Registry didn't work, use the search path. |
71 | 71 | if (name[0] == 0) |
72 | - strcpy(name, searchpath("gvim.exe")); | |
72 | + strcpy(name, searchpath((char *)"gvim.exe")); | |
73 | 73 | |
74 | 74 | if (!runtime) |
75 | 75 | { |
76 | 76 | // Only when looking for the executable, not the runtime dir, we can |
77 | 77 | // search for the batch file or a name without a path. |
78 | 78 | if (name[0] == 0) |
79 | - strcpy(name, searchpath("gvim.bat")); | |
79 | + strcpy(name, searchpath((char *)"gvim.bat")); | |
80 | 80 | if (name[0] == 0) |
81 | 81 | strcpy(name, "gvim"); // finds gvim.bat or gvim.exe |
82 | 82 |
@@ -152,9 +152,9 @@ | ||
152 | 152 | FARPROC *ptr; |
153 | 153 | } libintl_entry[] = |
154 | 154 | { |
155 | - {"gettext", (FARPROC*)&dyn_libintl_gettext}, | |
156 | - {"textdomain", (FARPROC*)&dyn_libintl_textdomain}, | |
157 | - {"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, | |
155 | + {(char *)"gettext", (FARPROC*)&dyn_libintl_gettext}, | |
156 | + {(char *)"textdomain", (FARPROC*)&dyn_libintl_textdomain}, | |
157 | + {(char *)"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, | |
158 | 158 | {NULL, NULL} |
159 | 159 | }; |
160 | 160 |
@@ -835,7 +835,7 @@ | ||
835 | 835 | (LPTSTR)location) > (HINSTANCE)32) |
836 | 836 | return location; |
837 | 837 | } |
838 | - return ""; | |
838 | + return (char *)""; | |
839 | 839 | } |
840 | 840 | # endif |
841 | 841 | #endif |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 80, | |
671 | +/**/ | |
670 | 672 | 79, |
671 | 673 | /**/ |
672 | 674 | 78, |