]>
Commit | Line | Data |
---|---|---|
f3c378e8 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.0.110 | |
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.0.110 | |
11 | Problem: Amiga: Compilation problems when not using libnix. | |
12 | Solution: Change a few #ifdefs. (Willy Catteau) | |
13 | Files: src/memfile.c | |
14 | ||
15 | ||
16 | *** ../vim-7.0.109/src/memfile.c Tue Mar 7 00:27:12 2006 | |
17 | --- src/memfile.c Sun Sep 17 15:50:00 2006 | |
18 | *************** | |
19 | *** 517,523 **** | |
20 | mf_ins_free(mfp, hp); /* put *hp in the free list */ | |
21 | } | |
22 | ||
23 | ! #if defined(__MORPHOS__) | |
24 | /* function is missing in MorphOS libnix version */ | |
25 | extern unsigned long *__stdfiledes; | |
26 | ||
27 | --- 517,523 ---- | |
28 | mf_ins_free(mfp, hp); /* put *hp in the free list */ | |
29 | } | |
30 | ||
31 | ! #if defined(__MORPHOS__) && defined(__libnix__) | |
32 | /* function is missing in MorphOS libnix version */ | |
33 | extern unsigned long *__stdfiledes; | |
34 | ||
35 | *************** | |
36 | *** 677,691 **** | |
37 | # else | |
38 | # if defined(_DCC) || defined(__GNUC__) || defined(__MORPHOS__) | |
39 | { | |
40 | ! # if defined(__GNUC__) && !defined(__MORPHOS__) | |
41 | /* Have function (in libnix at least), | |
42 | * but ain't got no prototype anywhere. */ | |
43 | extern unsigned long fdtofh(int filedescriptor); | |
44 | # endif | |
45 | BPTR fh = (BPTR)fdtofh(mfp->mf_fd); | |
46 | ||
47 | if (fh != 0) | |
48 | Flush(fh); | |
49 | } | |
50 | # else /* assume Manx */ | |
51 | Flush(_devtab[mfp->mf_fd].fd); | |
52 | --- 677,695 ---- | |
53 | # else | |
54 | # if defined(_DCC) || defined(__GNUC__) || defined(__MORPHOS__) | |
55 | { | |
56 | ! # if defined(__GNUC__) && !defined(__MORPHOS__) && defined(__libnix__) | |
57 | /* Have function (in libnix at least), | |
58 | * but ain't got no prototype anywhere. */ | |
59 | extern unsigned long fdtofh(int filedescriptor); | |
60 | # endif | |
61 | + # if !defined(__libnix__) | |
62 | + fflush(NULL); | |
63 | + # else | |
64 | BPTR fh = (BPTR)fdtofh(mfp->mf_fd); | |
65 | ||
66 | if (fh != 0) | |
67 | Flush(fh); | |
68 | + # endif | |
69 | } | |
70 | # else /* assume Manx */ | |
71 | Flush(_devtab[mfp->mf_fd].fd); | |
72 | *** ../vim-7.0.109/src/version.c Fri Sep 15 20:17:49 2006 | |
73 | --- src/version.c Tue Sep 26 13:48:48 2006 | |
74 | *************** | |
75 | *** 668,669 **** | |
76 | --- 668,671 ---- | |
77 | { /* Add new patch number below this line */ | |
78 | + /**/ | |
79 | + 110, | |
80 | /**/ | |
81 | ||
82 | -- | |
83 | A fool must search for a greater fool to find admiration. | |
84 | ||
85 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
86 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
87 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
88 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |