Ticket #1858: nas-1.7-gcc4-1.patch.epitome

File nas-1.7-gcc4-1.patch.epitome, 6.3 KB (added by craigmjackson@…, 21 years ago)

Modified version of Randy McMurchy's patch

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