projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8587d00a AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.358 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.358 | |
| 11 | Problem: Compiler warnings on VMS. (Zoltan Arpadffy) | |
| 12 | Solution: Pass array itself instead its address. Return a value. | |
| 13 | Files: src/gui_gtk_x11.c, src/os_unix.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.357/src/gui_gtk_x11.c 2009-11-03 18:13:36.000000000 +0100 | |
| 17 | --- src/gui_gtk_x11.c 2010-02-11 18:00:28.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 6190,6196 **** | |
| 20 | int pcc[MAX_MCO]; | |
| 21 | ||
| 22 | /* TODO: use the composing characters */ | |
| 23 | ! c = utfc_ptr2char_len(p, &pcc, len - (p - s)); | |
| 24 | if (c >= 0x10000) /* show chars > 0xffff as ? */ | |
| 25 | c = 0xbf; | |
| 26 | buf[textlen].byte1 = c >> 8; | |
| 27 | --- 6190,6196 ---- | |
| 28 | int pcc[MAX_MCO]; | |
| 29 | ||
| 30 | /* TODO: use the composing characters */ | |
| 31 | ! c = utfc_ptr2char_len(p, pcc, len - (p - s)); | |
| 32 | if (c >= 0x10000) /* show chars > 0xffff as ? */ | |
| 33 | c = 0xbf; | |
| 34 | buf[textlen].byte1 = c >> 8; | |
| 35 | *** ../vim-7.2.357/src/os_unix.c 2009-07-22 13:27:50.000000000 +0200 | |
| 36 | --- src/os_unix.c 2010-02-11 18:10:20.000000000 +0100 | |
| 37 | *************** | |
| 38 | *** 1471,1476 **** | |
| 39 | --- 1471,1479 ---- | |
| 40 | { | |
| 41 | /* This function should not return, it causes exit(). Longjump instead. */ | |
| 42 | LONGJMP(lc_jump_env, 1); | |
| 43 | + # ifdef VMS | |
| 44 | + return 0; /* avoid the compiler complains about missing return value */ | |
| 45 | + # endif | |
| 46 | } | |
| 47 | # endif | |
| 48 | ||
| 49 | *************** | |
| 50 | *** 1490,1495 **** | |
| 51 | --- 1493,1501 ---- | |
| 52 | ||
| 53 | /* This function should not return, it causes exit(). Longjump instead. */ | |
| 54 | LONGJMP(x_jump_env, 1); | |
| 55 | + # ifdef VMS | |
| 56 | + return 0; /* avoid the compiler complains about missing return value */ | |
| 57 | + # endif | |
| 58 | } | |
| 59 | #endif | |
| 60 | ||
| 61 | *** ../vim-7.2.357/src/version.c 2010-02-11 17:02:04.000000000 +0100 | |
| 62 | --- src/version.c 2010-02-11 18:10:45.000000000 +0100 | |
| 63 | *************** | |
| 64 | *** 683,684 **** | |
| 65 | --- 683,686 ---- | |
| 66 | { /* Add new patch number below this line */ | |
| 67 | + /**/ | |
| 68 | + 358, | |
| 69 | /**/ | |
| 70 | ||
| 71 | -- | |
| 72 | hundred-and-one symptoms of being an internet addict: | |
| 73 | 221. Your wife melts your keyboard in the oven. | |
| 74 | ||
| 75 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 76 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 77 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 78 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |