Annotation of /trunk/nas/patches/nas-1.7-gcc4.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 6156 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 6156 byte(s)
-import
1 | niro | 153 | Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> |
2 | Date: 2005-08-16 | ||
3 | Initial Package Version: 1.7 | ||
4 | Upstream Status: Submitted | ||
5 | Origin: NAS mailing list - Steve McIntyre | ||
6 | (http://nas.codebrilliance.com/nas/nas-ml/msg01148.html) | ||
7 | Description: Fixes compilation issues using GCC-4 | ||
8 | |||
9 | $LastChangedBy: randy $ | ||
10 | $Date: 2007-05-08 20:20:04 $ | ||
11 | |||
12 | |||
13 | --- nas-1.7.orig/clients/audio/auconvert/auconvert.c | ||
14 | +++ nas-1.7/clients/audio/auconvert/auconvert.c | ||
15 | @@ -383,7 +383,7 @@ | ||
16 | fatalError("Error writing output file"); | ||
17 | } | ||
18 | else | ||
19 | - rateConvert(in, out, numBytes, data); | ||
20 | + rateConvert(in, out, numBytes, (char *)data); | ||
21 | |||
22 | if (SoundCloseFile(out)) | ||
23 | fatalError("Error closing output file"); | ||
24 | --- nas-1.7.orig/clients/audio/auinfo/auinfo.c | ||
25 | +++ nas-1.7/clients/audio/auinfo/auinfo.c | ||
26 | @@ -26,6 +26,7 @@ | ||
27 | */ | ||
28 | |||
29 | #include <stdio.h> | ||
30 | +#include <stdlib.h> | ||
31 | #include <string.h> | ||
32 | #include <audio/audiolib.h> | ||
33 | |||
34 | --- nas-1.7.orig/clients/audio/aupanel/aupanel.c | ||
35 | +++ nas-1.7/clients/audio/aupanel/aupanel.c | ||
36 | @@ -28,6 +28,7 @@ | ||
37 | */ | ||
38 | |||
39 | #include <stdio.h> | ||
40 | +#include <stdlib.h> | ||
41 | #ifndef SYSV | ||
42 | #include <audio/Aos.h> /* for string and other os stuff */ | ||
43 | #endif | ||
44 | --- nas-1.7.orig/clients/audio/auplay/auplay.c | ||
45 | +++ nas-1.7/clients/audio/auplay/auplay.c | ||
46 | @@ -30,7 +30,9 @@ | ||
47 | #include <unistd.h> | ||
48 | #include <fcntl.h> | ||
49 | #include <stdio.h> | ||
50 | +#include <stdlib.h> | ||
51 | #include <signal.h> | ||
52 | +#include <string.h> | ||
53 | #include <audio/audiolib.h> | ||
54 | #include <audio/soundlib.h> | ||
55 | |||
56 | --- nas-1.7.orig/clients/audio/aurecord/aurecord.c | ||
57 | +++ nas-1.7/clients/audio/aurecord/aurecord.c | ||
58 | @@ -28,6 +28,7 @@ | ||
59 | */ | ||
60 | |||
61 | #include <stdio.h> | ||
62 | +#include <stdlib.h> | ||
63 | #include <signal.h> | ||
64 | #include <audio/Aos.h> /* for string and other os stuff */ | ||
65 | #include <audio/Afuncs.h> /* for bcopy et. al. */ | ||
66 | --- nas-1.7.orig/clients/audio/auwave/auwave.c | ||
67 | +++ nas-1.7/clients/audio/auwave/auwave.c | ||
68 | @@ -28,6 +28,7 @@ | ||
69 | */ | ||
70 | |||
71 | #include <stdio.h> | ||
72 | +#include <stdlib.h> | ||
73 | #ifndef SYSV | ||
74 | #include <audio/Aos.h> /* for string and other os stuff */ | ||
75 | #endif | ||
76 | --- nas-1.7.orig/clients/audio/examples/playFile.c | ||
77 | +++ nas-1.7/clients/audio/examples/playFile.c | ||
78 | @@ -9,6 +9,7 @@ | ||
79 | */ | ||
80 | |||
81 | #include <stdio.h> | ||
82 | +#include <stdlib.h> | ||
83 | #include <audio/audiolib.h> | ||
84 | #include <audio/soundlib.h> | ||
85 | |||
86 | --- nas-1.7.orig/clients/audio/examples/playSimul.c | ||
87 | +++ nas-1.7/clients/audio/examples/playSimul.c | ||
88 | @@ -9,6 +9,7 @@ | ||
89 | */ | ||
90 | |||
91 | #include <stdio.h> | ||
92 | +#include <stdlib.h> | ||
93 | #include <audio/audiolib.h> | ||
94 | #include <audio/soundlib.h> | ||
95 | |||
96 | @@ -48,7 +49,7 @@ | ||
97 | { | ||
98 | arg++; | ||
99 | argc--; | ||
100 | - volume = atoi(arg); | ||
101 | + volume = atoi(*arg); | ||
102 | } | ||
103 | } | ||
104 | else if (AuSoundPlayFromFile(aud, *arg, AuNone, | ||
105 | --- nas-1.7.orig/clients/audio/examples/playFromBckt.c | ||
106 | +++ nas-1.7/clients/audio/examples/playFromBckt.c | ||
107 | @@ -9,6 +9,7 @@ | ||
108 | */ | ||
109 | |||
110 | #include <stdio.h> | ||
111 | +#include <stdlib.h> | ||
112 | #include <audio/audiolib.h> | ||
113 | #include <audio/soundlib.h> | ||
114 | |||
115 | --- nas-1.7.orig/clients/audio/examples/loopBucket.c | ||
116 | +++ nas-1.7/clients/audio/examples/loopBucket.c | ||
117 | @@ -10,6 +10,7 @@ | ||
118 | */ | ||
119 | |||
120 | #include <stdio.h> | ||
121 | +#include <stdlib.h> | ||
122 | #include <audio/audiolib.h> | ||
123 | #include <audio/soundlib.h> | ||
124 | |||
125 | --- nas-1.7.orig/clients/audio/examples/bundle.c | ||
126 | +++ nas-1.7/clients/audio/examples/bundle.c | ||
127 | @@ -17,6 +17,7 @@ | ||
128 | */ | ||
129 | |||
130 | #include <stdio.h> | ||
131 | +#include <stdlib.h> | ||
132 | #include <audio/audiolib.h> | ||
133 | #include <audio/soundlib.h> | ||
134 | |||
135 | --- nas-1.7.orig/clients/audio/examples/recordBucket.c | ||
136 | +++ nas-1.7/clients/audio/examples/recordBucket.c | ||
137 | @@ -11,6 +11,7 @@ | ||
138 | */ | ||
139 | |||
140 | #include <stdio.h> | ||
141 | +#include <stdlib.h> | ||
142 | #include <audio/audiolib.h> | ||
143 | #include <audio/soundlib.h> | ||
144 | |||
145 | --- nas-1.7.orig/clients/audio/examples/plyBcktAsync.c | ||
146 | +++ nas-1.7/clients/audio/examples/plyBcktAsync.c | ||
147 | @@ -7,6 +7,7 @@ | ||
148 | */ | ||
149 | |||
150 | #include <stdio.h> | ||
151 | +#include <stdlib.h> | ||
152 | #include <audio/audiolib.h> | ||
153 | #include <audio/soundlib.h> | ||
154 | |||
155 | --- nas-1.7.orig/clients/audio/util/playbucket.c | ||
156 | +++ nas-1.7/clients/audio/util/playbucket.c | ||
157 | @@ -23,6 +23,7 @@ | ||
158 | */ | ||
159 | |||
160 | #include <stdio.h> | ||
161 | +#include <stdlib.h> | ||
162 | #include <string.h> | ||
163 | #include <audio/audiolib.h> | ||
164 | #include <audio/soundlib.h> | ||
165 | --- nas-1.7.orig/clients/audio/widgets/Slider.c | ||
166 | +++ nas-1.7/clients/audio/widgets/Slider.c | ||
167 | @@ -31,6 +31,7 @@ | ||
168 | #include <X11/StringDefs.h> | ||
169 | #include <X11/Xaw/Label.h> | ||
170 | #include <X11/Xaw/Scrollbar.h> | ||
171 | +#include <stdio.h> | ||
172 | #include "SliderP.h" | ||
173 | |||
174 | static XtResource resources[] = { | ||
175 | --- nas-1.7.orig/server/dia/auprocess.c | ||
176 | +++ nas-1.7/server/dia/auprocess.c | ||
177 | @@ -25,6 +25,7 @@ | ||
178 | #define _AUPROCESS_C_ | ||
179 | #define OUTPUT_RANGE_CHECK | ||
180 | |||
181 | +#include <string.h> | ||
182 | #include <audio/audio.h> | ||
183 | #include <audio/Aproto.h> | ||
184 | #include "au.h" | ||
185 | --- nas-1.7.orig/server/dia/auutil.c | ||
186 | +++ nas-1.7/server/dia/auutil.c | ||
187 | @@ -173,7 +173,7 @@ | ||
188 | AuCreateResourceTypes() | ||
189 | { | ||
190 | void AuFreeComponent(); | ||
191 | - static void freeFlow(); | ||
192 | + void freeFlow(); | ||
193 | |||
194 | auComponentType = CreateNewResourceType(AuFreeComponent); | ||
195 | auFlowType = CreateNewResourceType(freeFlow); | ||
196 | --- nas-1.7.orig/server/os/access.c | ||
197 | +++ nas-1.7/server/os/access.c | ||
198 | @@ -583,7 +583,8 @@ | ||
199 | AuthorizedClient(client) | ||
200 | ClientPtr client; | ||
201 | { | ||
202 | - int alen, family; | ||
203 | + int family; | ||
204 | + socklen_t alen; | ||
205 | #ifndef AMOEBA | ||
206 | struct sockaddr from; | ||
207 | #else | ||
208 | --- nas-1.7.orig/server/os/connection.c | ||
209 | +++ nas-1.7/server/os/connection.c | ||
210 | @@ -1402,7 +1402,7 @@ | ||
211 | struct sockaddr_dn dn; | ||
212 | #endif /* DNETCONN */ | ||
213 | } from; | ||
214 | - int fromlen = sizeof (from); | ||
215 | + socklen_t fromlen = sizeof (from); | ||
216 | AuID auth_id; | ||
217 | |||
218 | auth_id = CheckAuthorization (proto_n, auth_proto, | ||
219 | @@ -1480,7 +1480,7 @@ | ||
220 | struct sockaddr_dn dn; | ||
221 | #endif /* DNETCONN */ | ||
222 | } from; | ||
223 | - int fromlen; | ||
224 | + socklen_t fromlen; | ||
225 | #endif /* TCP_NODELAY */ | ||
226 | |||
227 | readyconnections = (((long)closure) & WellKnownConnections); | ||
228 | @@ -1504,7 +1504,7 @@ | ||
229 | readyconnections &= ~(1 << curconn); | ||
230 | if ((newconn = accept (curconn, | ||
231 | (struct sockaddr *) NULL, | ||
232 | - (int *)NULL)) < 0) | ||
233 | + (socklen_t *)NULL)) < 0) | ||
234 | continue; | ||
235 | if (newconn > lastfdesc) | ||
236 | { | ||
237 | --- nas-1.7.orig/server/os/utils.c | ||
238 | +++ nas-1.7/server/os/utils.c | ||
239 | @@ -51,6 +51,7 @@ | ||
240 | #include <audio/audio.h> | ||
241 | #include <audio/Aos.h> | ||
242 | #include <stdio.h> | ||
243 | +#include <stdlib.h> | ||
244 | #include "nasconf.h" | ||
245 | #include "misc.h" | ||
246 | #include "opaque.h" | ||
247 |