projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d02ad552 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.172 | |
| 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.172 (after 6.2.169) | |
| 11 | Problem: The prototype for _Xmblen() still causes trouble. | |
| 12 | Solution: Include the X11 header file that defines the prototype. | |
| 13 | Files: src/osdef2.h.in, src/osdef.sh | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.171/src/osdef2.h.in Mon Dec 29 21:17:44 2003 | |
| 17 | --- src/osdef2.h.in Mon Jan 5 10:03:41 2004 | |
| 18 | *************** | |
| 19 | *** 83,87 **** | |
| 20 | --- 83,88 ---- | |
| 21 | #ifdef ISC | |
| 22 | extern int _Xmblen __ARGS((char const *, size_t)); | |
| 23 | #else | |
| 24 | + /* This is different from the header but matches mblen() */ | |
| 25 | extern int _Xmblen __ARGS((char *, size_t)); | |
| 26 | #endif | |
| 27 | *** ../vim-6.2.171/src/osdef.sh Thu Jul 24 22:09:03 2003 | |
| 28 | --- src/osdef.sh Mon Jan 5 10:05:41 2004 | |
| 29 | *************** | |
| 30 | *** 41,46 **** | |
| 31 | --- 41,50 ---- | |
| 32 | # include <sys/types.h> | |
| 33 | # include <sys/statfs.h> /* only for memfile.c */ | |
| 34 | #endif | |
| 35 | + | |
| 36 | + #ifdef HAVE_X11 | |
| 37 | + # include <X11/Intrinsic.h> | |
| 38 | + #endif | |
| 39 | EOF | |
| 40 | ||
| 41 | # Mac uses precompiled headers, but we need real headers here. | |
| 42 | *** ../vim-6.2.171/src/version.c Tue Jan 6 16:20:37 2004 | |
| 43 | --- src/version.c Tue Jan 6 16:24:51 2004 | |
| 44 | *************** | |
| 45 | *** 639,640 **** | |
| 46 | --- 639,642 ---- | |
| 47 | { /* Add new patch number below this line */ | |
| 48 | + /**/ | |
| 49 | + 172, | |
| 50 | /**/ | |
| 51 | ||
| 52 | -- | |
| 53 | You are not really successful until someone claims he sat | |
| 54 | beside you in school. | |
| 55 | ||
| 56 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 57 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 58 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 59 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |