projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d02ad552 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.169 | |
| 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 6.2.169 | |
| 11 | Problem: The prototype for _Xmblen() appears in a recent XFree86 header | |
| 12 | file, causing a warning for our prototype. (Hisashi T Fujinaka) | |
| 13 | Solution: Move the prototype to an osdef file, so that it's filtered out. | |
| 14 | Files: src/mbyte.c, src/osdef2.h.in | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.168/src/mbyte.c Sun Nov 9 20:20:26 2003 | |
| 18 | --- src/mbyte.c Tue Dec 23 16:03:30 2003 | |
| 19 | *************** | |
| 20 | *** 543,549 **** | |
| 21 | # else | |
| 22 | char buf[MB_MAXBYTES]; | |
| 23 | # ifdef X_LOCALE | |
| 24 | - extern int _Xmblen __ARGS((char *, size_t)); | |
| 25 | # ifndef mblen | |
| 26 | # define mblen _Xmblen | |
| 27 | # endif | |
| 28 | --- 547,552 ---- | |
| 29 | *** ../vim-6.2.168/src/osdef2.h.in Sat Dec 15 22:24:12 2001 | |
| 30 | --- src/osdef2.h.in Wed Dec 24 10:26:00 2003 | |
| 31 | *************** | |
| 32 | *** 79,81 **** | |
| 33 | --- 79,87 ---- | |
| 34 | #else | |
| 35 | extern char *mktemp __ARGS((char *)); | |
| 36 | #endif | |
| 37 | + | |
| 38 | + #ifdef ISC | |
| 39 | + extern int _Xmblen __ARGS((char const *, size_t)); | |
| 40 | + #else | |
| 41 | + extern int _Xmblen __ARGS((char *, size_t)); | |
| 42 | + #endif | |
| 43 | *** ../vim-6.2.168/src/version.c Mon Dec 29 21:14:00 2003 | |
| 44 | --- src/version.c Mon Dec 29 21:16:30 2003 | |
| 45 | *************** | |
| 46 | *** 639,640 **** | |
| 47 | --- 639,642 ---- | |
| 48 | { /* Add new patch number below this line */ | |
| 49 | + /**/ | |
| 50 | + 169, | |
| 51 | /**/ | |
| 52 | ||
| 53 | -- | |
| 54 | From "know your smileys": | |
| 55 | :-* A big kiss! | |
| 56 | ||
| 57 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 58 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 59 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 60 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |