projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 0a7814d6 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.080 (extra) | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.080 (extra) | |
| 11 | Problem: Compiler warnings for using "const char *" for "char *". | |
| 12 | Solution: Add type casts. (Chris Sutcliffe) | |
| 13 | Files: src/GvimExt/gvimext.cpp | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.079/src/GvimExt/gvimext.cpp Thu May 10 21:09:38 2007 | |
| 17 | --- src/GvimExt/gvimext.cpp Thu Aug 16 21:25:56 2007 | |
| 18 | *************** | |
| 19 | *** 69,82 **** | |
| 20 | ||
| 21 | // Registry didn't work, use the search path. | |
| 22 | if (name[0] == 0) | |
| 23 | ! strcpy(name, searchpath("gvim.exe")); | |
| 24 | ||
| 25 | if (!runtime) | |
| 26 | { | |
| 27 | // Only when looking for the executable, not the runtime dir, we can | |
| 28 | // search for the batch file or a name without a path. | |
| 29 | if (name[0] == 0) | |
| 30 | ! strcpy(name, searchpath("gvim.bat")); | |
| 31 | if (name[0] == 0) | |
| 32 | strcpy(name, "gvim"); // finds gvim.bat or gvim.exe | |
| 33 | ||
| 34 | --- 69,82 ---- | |
| 35 | ||
| 36 | // Registry didn't work, use the search path. | |
| 37 | if (name[0] == 0) | |
| 38 | ! strcpy(name, searchpath((char *)"gvim.exe")); | |
| 39 | ||
| 40 | if (!runtime) | |
| 41 | { | |
| 42 | // Only when looking for the executable, not the runtime dir, we can | |
| 43 | // search for the batch file or a name without a path. | |
| 44 | if (name[0] == 0) | |
| 45 | ! strcpy(name, searchpath((char *)"gvim.bat")); | |
| 46 | if (name[0] == 0) | |
| 47 | strcpy(name, "gvim"); // finds gvim.bat or gvim.exe | |
| 48 | ||
| 49 | *************** | |
| 50 | *** 152,160 **** | |
| 51 | FARPROC *ptr; | |
| 52 | } libintl_entry[] = | |
| 53 | { | |
| 54 | ! {"gettext", (FARPROC*)&dyn_libintl_gettext}, | |
| 55 | ! {"textdomain", (FARPROC*)&dyn_libintl_textdomain}, | |
| 56 | ! {"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, | |
| 57 | {NULL, NULL} | |
| 58 | }; | |
| 59 | ||
| 60 | --- 152,160 ---- | |
| 61 | FARPROC *ptr; | |
| 62 | } libintl_entry[] = | |
| 63 | { | |
| 64 | ! {(char *)"gettext", (FARPROC*)&dyn_libintl_gettext}, | |
| 65 | ! {(char *)"textdomain", (FARPROC*)&dyn_libintl_textdomain}, | |
| 66 | ! {(char *)"bindtextdomain", (FARPROC*)&dyn_libintl_bindtextdomain}, | |
| 67 | {NULL, NULL} | |
| 68 | }; | |
| 69 | ||
| 70 | *************** | |
| 71 | *** 835,841 **** | |
| 72 | (LPTSTR)location) > (HINSTANCE)32) | |
| 73 | return location; | |
| 74 | } | |
| 75 | ! return ""; | |
| 76 | } | |
| 77 | # endif | |
| 78 | #endif | |
| 79 | --- 835,841 ---- | |
| 80 | (LPTSTR)location) > (HINSTANCE)32) | |
| 81 | return location; | |
| 82 | } | |
| 83 | ! return (char *)""; | |
| 84 | } | |
| 85 | # endif | |
| 86 | #endif | |
| 87 | *** ../vim-7.1.079/src/version.c Wed Aug 15 20:40:45 2007 | |
| 88 | --- src/version.c Sat Aug 18 16:58:36 2007 | |
| 89 | *************** | |
| 90 | *** 668,669 **** | |
| 91 | --- 668,671 ---- | |
| 92 | { /* Add new patch number below this line */ | |
| 93 | + /**/ | |
| 94 | + 80, | |
| 95 | /**/ | |
| 96 | ||
| 97 | -- | |
| 98 | hundred-and-one symptoms of being an internet addict: | |
| 99 | 192. Your boss asks you to "go fer" coffee and you come up with 235 FTP sites. | |
| 100 | ||
| 101 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 102 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 103 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 104 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |