]>
Commit | Line | Data |
---|---|---|
5ee5dc07 AM |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.0.015 | |
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.015 | |
11 | Problem: Athena: compilation problems with modern compiler. | |
12 | Solution: Avoid type casts for lvalue. (Alexey Froloff) | |
13 | Files: src/gui_at_fs.c | |
14 | ||
15 | ||
16 | *** ../vim-7.0.014/src/gui_at_fs.c Wed May 10 15:22:49 2006 | |
17 | --- src/gui_at_fs.c Fri May 12 11:26:24 2006 | |
18 | *************** | |
19 | *** 1861,1887 **** | |
20 | XtPointer pnew; | |
21 | { | |
22 | SFDir *dir; | |
23 | ! int nw; | |
24 | ||
25 | dir = &(SFdirs[SFdirPtr + (int)(long)n]); | |
26 | ||
27 | #ifdef FEAT_GUI_NEXTAW | |
28 | ! if ((int)(long)pnew < 0) | |
29 | { | |
30 | ! if ((int)(long)pnew > -SFvScrollHeight) | |
31 | ! (int)(long)pnew = -1; | |
32 | else | |
33 | ! (int)(long)pnew = -SFlistSize; | |
34 | } | |
35 | ! else if ((int)(long)pnew > 0) | |
36 | { | |
37 | ! if ((int)(long)pnew < SFvScrollHeight) | |
38 | ! (int)(long)pnew = 1; | |
39 | else | |
40 | ! (int)(long)pnew = SFlistSize; | |
41 | } | |
42 | #endif | |
43 | ! nw = dir->vOrigin + (int)(long)pnew; | |
44 | ||
45 | if (nw > dir->nEntries - SFlistSize) | |
46 | nw = dir->nEntries - SFlistSize; | |
47 | --- 1861,1887 ---- | |
48 | XtPointer pnew; | |
49 | { | |
50 | SFDir *dir; | |
51 | ! int nw = (int)(long)pnew; | |
52 | ||
53 | dir = &(SFdirs[SFdirPtr + (int)(long)n]); | |
54 | ||
55 | #ifdef FEAT_GUI_NEXTAW | |
56 | ! if (nw < 0) | |
57 | { | |
58 | ! if (nw > -SFvScrollHeight) | |
59 | ! nw = -1; | |
60 | else | |
61 | ! nw = -SFlistSize; | |
62 | } | |
63 | ! else if (nw > 0) | |
64 | { | |
65 | ! if (nw < SFvScrollHeight) | |
66 | ! nw = 1; | |
67 | else | |
68 | ! nw = SFlistSize; | |
69 | } | |
70 | #endif | |
71 | ! nw += dir->vOrigin; | |
72 | ||
73 | if (nw > dir->nEntries - SFlistSize) | |
74 | nw = dir->nEntries - SFlistSize; | |
75 | *************** | |
76 | *** 1941,1967 **** | |
77 | XtPointer pnew; | |
78 | { | |
79 | SFDir *dir; | |
80 | ! int nw; | |
81 | ||
82 | dir = &(SFdirs[SFdirPtr + (int)(long)n]); | |
83 | ||
84 | #ifdef FEAT_GUI_NEXTAW | |
85 | ! if ((int)(long)pnew < 0) | |
86 | { | |
87 | ! if ((int)(long)pnew > -SFhScrollWidth) | |
88 | ! (int)(long)pnew = -1; | |
89 | else | |
90 | ! (int)(long)pnew = -SFcharsPerEntry; | |
91 | } | |
92 | ! else if ((int)(long)pnew > 0) | |
93 | { | |
94 | ! if ((int)(long)pnew < SFhScrollWidth) | |
95 | ! (int)(long)pnew = 1; | |
96 | else | |
97 | ! (int)(long)pnew = SFcharsPerEntry; | |
98 | } | |
99 | #endif | |
100 | ! nw = dir->hOrigin + (int)(long)pnew; | |
101 | ||
102 | if (nw > dir->nChars - SFcharsPerEntry) | |
103 | nw = dir->nChars - SFcharsPerEntry; | |
104 | --- 1941,1967 ---- | |
105 | XtPointer pnew; | |
106 | { | |
107 | SFDir *dir; | |
108 | ! int nw = (int)(long)pnew; | |
109 | ||
110 | dir = &(SFdirs[SFdirPtr + (int)(long)n]); | |
111 | ||
112 | #ifdef FEAT_GUI_NEXTAW | |
113 | ! if (nw < 0) | |
114 | { | |
115 | ! if (nw > -SFhScrollWidth) | |
116 | ! nw = -1; | |
117 | else | |
118 | ! nw = -SFcharsPerEntry; | |
119 | } | |
120 | ! else if (nw > 0) | |
121 | { | |
122 | ! if (nw < SFhScrollWidth) | |
123 | ! nw = 1; | |
124 | else | |
125 | ! nw = SFcharsPerEntry; | |
126 | } | |
127 | #endif | |
128 | ! nw += dir->hOrigin; | |
129 | ||
130 | if (nw > dir->nChars - SFcharsPerEntry) | |
131 | nw = dir->nChars - SFcharsPerEntry; | |
132 | *************** | |
133 | *** 2038,2063 **** | |
134 | XtPointer client_data; | |
135 | XtPointer pnew; | |
136 | { | |
137 | ! int nw; | |
138 | float f; | |
139 | ||
140 | #ifdef FEAT_GUI_NEXTAW | |
141 | ! if ((int)(long)pnew < 0) | |
142 | { | |
143 | ! if ((int)(long)pnew > -SFpathScrollWidth) | |
144 | ! (int)(long)pnew = -1; | |
145 | else | |
146 | ! (int)(long)pnew = -3; | |
147 | } | |
148 | ! else if ((int)(long)pnew > 0) | |
149 | { | |
150 | ! if ((int)(long)pnew < SFpathScrollWidth) | |
151 | ! (int)(long)pnew = 1; | |
152 | else | |
153 | ! (int)(long)pnew = 3; | |
154 | } | |
155 | #endif | |
156 | ! nw = SFdirPtr + (int)(long)pnew; | |
157 | ||
158 | if (nw > SFdirEnd - 3) | |
159 | nw = SFdirEnd - 3; | |
160 | --- 2038,2063 ---- | |
161 | XtPointer client_data; | |
162 | XtPointer pnew; | |
163 | { | |
164 | ! int nw = (int)(long)pnew; | |
165 | float f; | |
166 | ||
167 | #ifdef FEAT_GUI_NEXTAW | |
168 | ! if (nw < 0) | |
169 | { | |
170 | ! if (nw > -SFpathScrollWidth) | |
171 | ! nw = -1; | |
172 | else | |
173 | ! nw = -3; | |
174 | } | |
175 | ! else if (nw > 0) | |
176 | { | |
177 | ! if (nw < SFpathScrollWidth) | |
178 | ! nw = 1; | |
179 | else | |
180 | ! nw = 3; | |
181 | } | |
182 | #endif | |
183 | ! nw += SFdirPtr; | |
184 | ||
185 | if (nw > SFdirEnd - 3) | |
186 | nw = SFdirEnd - 3; | |
187 | *** ../vim-7.0.014/src/version.c Fri May 12 19:24:33 2006 | |
188 | --- src/version.c Fri May 12 19:25:57 2006 | |
189 | *************** | |
190 | *** 668,669 **** | |
191 | --- 668,671 ---- | |
192 | { /* Add new patch number below this line */ | |
193 | + /**/ | |
194 | + 15, | |
195 | /**/ | |
196 | ||
197 | -- | |
198 | hundred-and-one symptoms of being an internet addict: | |
199 | 127. You bring your laptop and cellular phone to church. | |
200 | ||
201 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
202 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
203 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
204 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |