Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-action/chromium/files: 0.9.12-gcc43.patch
Date: Mon, 09 Jun 2008 12:50:25
Message-Id: E1K5gpH-0007SP-MJ@stork.gentoo.org
1 loki_val 08/06/09 12:50:19
2
3 Added: 0.9.12-gcc43.patch
4 Log:
5 Gcc4.3 fix; bug 217710
6 (Portage version: 2.1.5.4)
7
8 Revision Changes Path
9 1.1 games-action/chromium/files/0.9.12-gcc43.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/chromium/files/0.9.12-gcc43.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/chromium/files/0.9.12-gcc43.patch?rev=1.1&content-type=text/plain
13
14 Index: 0.9.12-gcc43.patch
15 ===================================================================
16 --- src-setup/Audio.cpp
17 +++ src-setup/Audio.cpp
18 @@ -7,13 +7,13 @@
19 */
20 #include "Audio.h"
21
22 -#include <stdio.h>
23 -#include <stdlib.h>
24 -#include <string.h>
25 +#include <cstdio>
26 +#include <cstdlib>
27 +#include <cstring>
28
29 #ifndef _WIN32
30 #include <unistd.h>
31 -#include <errno.h>
32 +#include <cerrno>
33 #include <fcntl.h>
34 #include <sys/stat.h>
35 #include <sys/types.h>
36 @@ -23,6 +23,7 @@
37 #include <AL/alc.h>
38 #include <AL/alut.h>
39
40 +
41 //====================================================================
42 Audio::Audio()
43 {
44 --- src-setup/ConfigFile.cpp
45 +++ src-setup/ConfigFile.cpp
46 @@ -7,8 +7,8 @@
47 */
48 #include "ConfigFile.h"
49
50 -#include <stdio.h>
51 -#include <stdlib.h>
52 +#include <cstdio>
53 +#include <cstdlib>
54
55 #include <qapp.h>
56 #include <qfiledialog.h>
57 --- src-setup/HelpPage.cpp
58 +++ src-setup/HelpPage.cpp
59 @@ -7,7 +7,7 @@
60 */
61 #include "HelpPage.h"
62
63 -#include <stdio.h>
64 +#include <cstdio>
65
66 #include <qwidget.h>
67 #include <qapplication.h>
68 --- src-setup/HiScoreWidget.cpp
69 +++ src-setup/HiScoreWidget.cpp
70 @@ -1,7 +1,7 @@
71 #include "HiScoreWidget.h"
72
73 -#include <stdio.h>
74 -#include <stdlib.h>
75 +#include <cstdio>
76 +#include <cstdlib>
77
78 #include <qfileinfo.h>
79
80 --- src-setup/HiScoreWidget.h
81 +++ src-setup/HiScoreWidget.h
82 @@ -8,7 +8,7 @@
83 #ifndef HiScoreWidget_h
84 #define HiScoreWidget_h
85
86 -#include <time.h>
87 +#include <ctime>
88
89 #include <qlabel.h>
90 #include <qlayout.h>
91 --- src-setup/MainWidget.cpp
92 +++ src-setup/MainWidget.cpp
93 @@ -7,8 +7,8 @@
94 */
95 #include "MainWidget.h"
96
97 -#include <stdio.h>
98 -#include <stdlib.h>
99 +#include <cstdio>
100 +#include <cstdlib>
101
102 #include <qapp.h>
103 #include <qfile.h>
104 --- src-setup/PlayList.cpp
105 +++ src-setup/PlayList.cpp
106 @@ -7,8 +7,8 @@
107 */
108 #include "PlayList.h"
109
110 -#include <stdio.h>
111 -#include <stdlib.h>
112 +#include <cstdio>
113 +#include <cstdlib>
114
115 #include <qapp.h>
116 #include <qtooltip.h>
117 --- src/Ammo.cpp
118 +++ src/Ammo.cpp
119 @@ -7,7 +7,7 @@
120 */
121 #include "Ammo.h"
122
123 -#include <stdio.h>
124 +#include <cstdio>
125
126
127 int ActiveAmmo::ammoCount = 0;
128 --- src/AudioOpenAL.cpp
129 +++ src/AudioOpenAL.cpp
130 @@ -15,14 +15,14 @@
131 void alcDestroyContext(void*) { alExit(); }
132 #endif //macintosh
133
134 -#include <stdio.h>
135 -#include <stdlib.h>
136 -#include <stdarg.h>
137 -#include <string.h>
138 +#include <cstdio>
139 +#include <cstdlib>
140 +#include <cstdarg>
141 +#include <cstring>
142
143 #ifndef _WIN32
144 #include <unistd.h>
145 - #include <errno.h>
146 + #include <cerrno>
147 #include <fcntl.h>
148 #include <sys/stat.h>
149 #include <sys/types.h>
150 --- src/AudioSDLMixer.cpp
151 +++ src/AudioSDLMixer.cpp
152 @@ -9,14 +9,14 @@
153
154 #include "AudioSDLMixer.h"
155
156 -#include <stdio.h>
157 -#include <stdlib.h>
158 +#include <cstdio>
159 +#include <cstdlib>
160 #include <stdarg.h>
161 -#include <string.h>
162 +#include <cstring>
163
164 #ifndef _WIN32
165 #include <unistd.h>
166 -#include <errno.h>
167 +#include <cerrno>
168 #include <fcntl.h>
169 #include <sys/stat.h>
170 #endif // _WIN32
171 --- src/Config.cpp
172 +++ src/Config.cpp
173 @@ -10,9 +10,9 @@
174 #include "HiScore.h"
175
176 //====================================================================
177 -#include <stdio.h>
178 -#include <stdlib.h>
179 -#include <string.h>
180 +#include <cstdio>
181 +#include <cstdlib>
182 +#include <cstring>
183
184 #include "NCString.h"
185
186 --- src/EnemyAircraft.cpp
187 +++ src/EnemyAircraft.cpp
188 @@ -7,9 +7,9 @@
189 */
190 #include "EnemyAircraft.h"
191
192 -#include <stdio.h>
193 -#include <stdlib.h>
194 -#include <math.h>
195 +#include <cstdio>
196 +#include <cstdlib>
197 +#include <cmath>
198
199 #include "Config.h"
200
201 --- src/EnemyAircraft_Boss00.cpp
202 +++ src/EnemyAircraft_Boss00.cpp
203 @@ -7,9 +7,9 @@
204 */
205 #include "EnemyAircraft_Boss00.h"
206
207 -#include <stdio.h>
208 -#include <stdlib.h>
209 -#include <math.h>
210 +#include <cstdio>
211 +#include <cstdlib>
212 +#include <cmath>
213
214 #include "Config.h"
215
216 --- src/EnemyAircraft_Boss01.cpp
217 +++ src/EnemyAircraft_Boss01.cpp
218 @@ -7,9 +7,9 @@
219 */
220 #include "EnemyAircraft_Boss01.h"
221
222 -#include <stdio.h>
223 -#include <stdlib.h>
224 -#include <math.h>
225 +#include <cstdio>
226 +#include <cstdlib>
227 +#include <cmath>
228
229 #include "Config.h"
230
231 --- src/EnemyAircraft_Gnat.cpp
232 +++ src/EnemyAircraft_Gnat.cpp
233 @@ -7,9 +7,9 @@
234 */
235 #include "EnemyAircraft_Gnat.h"
236
237 -#include <stdio.h>
238 -#include <stdlib.h>
239 -#include <math.h>
240 +#include <cstdio>
241 +#include <cstdlib>
242 +#include <cmath>
243
244 #include "Config.h"
245
246 --- src/EnemyAircraft_Omni.cpp
247 +++ src/EnemyAircraft_Omni.cpp
248 @@ -7,9 +7,9 @@
249 */
250 #include "EnemyAircraft_Omni.h"
251
252 -#include <stdio.h>
253 -#include <stdlib.h>
254 -#include <math.h>
255 +#include <cstdio>
256 +#include <cstdlib>
257 +#include <cmath>
258
259 #include "Config.h"
260
261 --- src/EnemyAircraft_RayGun.cpp
262 +++ src/EnemyAircraft_RayGun.cpp
263 @@ -7,9 +7,9 @@
264 */
265 #include "EnemyAircraft_RayGun.h"
266
267 -#include <stdio.h>
268 -#include <stdlib.h>
269 -#include <math.h>
270 +#include <cstdio>
271 +#include <cstdlib>
272 +#include <cmath>
273
274 #include "Config.h"
275
276 --- src/EnemyAircraft_Straight.cpp
277 +++ src/EnemyAircraft_Straight.cpp
278 @@ -7,9 +7,9 @@
279 */
280 #include "EnemyAircraft_Straight.h"
281
282 -#include <stdio.h>
283 -#include <stdlib.h>
284 -#include <math.h>
285 +#include <cstdio>
286 +#include <cstdlib>
287 +#include <cmath>
288
289 #include "Config.h"
290
291 --- src/EnemyAircraft_Tank.cpp
292 +++ src/EnemyAircraft_Tank.cpp
293 @@ -7,9 +7,9 @@
294 */
295 #include "EnemyAircraft_Tank.h"
296
297 -#include <stdio.h>
298 -#include <stdlib.h>
299 -#include <math.h>
300 +#include <cstdio>
301 +#include <cstdlib>
302 +#include <cmath>
303
304 #include "Config.h"
305
306 --- src/EnemyAmmo.cpp
307 +++ src/EnemyAmmo.cpp
308 @@ -7,9 +7,9 @@
309 */
310 #include "EnemyAmmo.h"
311
312 -#include <stdio.h>
313 -#include <stdlib.h>
314 -#include <math.h>
315 +#include <cstdio>
316 +#include <cstdlib>
317 +#include <cmath>
318
319 #include "compatibility.h"
320 #include <GL/gl.h>
321 --- src/EnemyFleet.cpp
322 +++ src/EnemyFleet.cpp
323 @@ -7,8 +7,8 @@
324 */
325 #include "EnemyFleet.h"
326
327 -#include <stdio.h>
328 -#include <math.h>
329 +#include <cstdio>
330 +#include <cmath>
331
332 #include "compatibility.h"
333 #include <GL/gl.h>
334 --- src/Explosions.cpp
335 +++ src/Explosions.cpp
336 @@ -7,7 +7,7 @@
337 */
338 #include "Explosions.h"
339
340 -#include <stdlib.h>
341 +#include <cstdlib>
342
343 #include "compatibility.h"
344 #include <GL/gl.h>
345 --- src/Global.h
346 +++ src/Global.h
347 @@ -8,8 +8,8 @@
348 #ifndef Global_h
349 #define Global_h
350
351 -#include <stdio.h>
352 -#include <time.h>
353 +#include <cstdio>
354 +#include <ctime>
355
356 #include "define.h"
357 #include "TexFont.h"
358 --- src/GroundMetal.cpp
359 +++ src/GroundMetal.cpp
360 @@ -8,7 +8,7 @@
361 #include "GroundMetal.h"
362
363 #include <GL/glpng.h>
364 -#include <math.h>
365 +#include <cmath>
366
367 #include "extern.h"
368 #include "Global.h"
369 --- src/GroundMetalSegment.cpp
370 +++ src/GroundMetalSegment.cpp
371 @@ -7,7 +7,7 @@
372 */
373 #include "GroundMetalSegment.h"
374
375 -#include <math.h>
376 +#include <cmath>
377
378 #include "compatibility.h"
379 #include <GL/gl.h>
380 --- src/GroundSea.cpp
381 +++ src/GroundSea.cpp
382 @@ -7,7 +7,7 @@
383 */
384 #include "GroundSea.h"
385
386 -#include <stdlib.h>
387 +#include <cstdlib>
388 #include <GL/glpng.h>
389
390 #include "extern.h"
391 --- src/GroundSeaSegment.cpp
392 +++ src/GroundSeaSegment.cpp
393 @@ -7,7 +7,7 @@
394 */
395 #include "GroundSeaSegment.h"
396
397 -#include <math.h>
398 +#include <cmath>
399
400 #include "compatibility.h"
401 #include <GL/gl.h>
402 --- src/HeroAircraft.cpp
403 +++ src/HeroAircraft.cpp
404 @@ -7,9 +7,9 @@
405 */
406 #include "HeroAircraft.h"
407
408 -#include <stdio.h>
409 -#include <stdlib.h>
410 -#include <math.h>
411 +#include <cstdio>
412 +#include <cstdlib>
413 +#include <cmath>
414
415 #include "compatibility.h"
416 #include <GL/gl.h>
417 --- src/HeroAmmo.cpp
418 +++ src/HeroAmmo.cpp
419 @@ -7,8 +7,8 @@
420 */
421 #include "HeroAmmo.h"
422
423 -#include <stdio.h>
424 -#include <stdlib.h>
425 +#include <cstdio>
426 +#include <cstdlib>
427
428 #include "compatibility.h"
429 #include <GL/gl.h>
430 --- src/HiScore.cpp
431 +++ src/HiScore.cpp
432 @@ -11,9 +11,9 @@
433 #include "HeroAircraft.h"
434
435 //====================================================================
436 -#include <stdio.h>
437 -#include <stdlib.h>
438 -#include <string.h>
439 +#include <cstdio>
440 +#include <cstdlib>
441 +#include <cstring>
442
443 HiScore *HiScore::instance = 0;
444
445 --- src/HiScore.h
446 +++ src/HiScore.h
447 @@ -8,8 +8,8 @@
448 #ifndef HiScore_h
449 #define HiScore_h
450
451 -#include <stdio.h>
452 -#include <time.h>
453 +#include <cstdio>
454 +#include <ctime>
455
456 #include "define.h"
457
458 --- src/MainGL.cpp
459 +++ src/MainGL.cpp
460 @@ -7,10 +7,10 @@
461 */
462 #include "MainGL.h"
463
464 -#include <stdio.h>
465 -#include <stdlib.h>
466 -#include <string.h>
467 -#include <math.h>
468 +#include <cstdio>
469 +#include <cstdlib>
470 +#include <cstring>
471 +#include <cmath>
472
473 #include "compatibility.h"
474 #include <GL/gl.h>
475 --- src/MainGLUT.cpp
476 +++ src/MainGLUT.cpp
477 @@ -9,7 +9,7 @@
478
479 #ifdef USE_GLUT
480
481 -#include <stdio.h>
482 +#include <cstdio>
483 #include <unistd.h>
484
485 #include <GL/glut.h>
486 --- src/MainSDL.cpp
487 +++ src/MainSDL.cpp
488 @@ -9,8 +9,8 @@
489
490 #ifdef USE_SDL
491
492 -#include <stdlib.h>
493 -#include <math.h>
494 +#include <cstdlib>
495 +#include <cmath>
496 #include <SDL.h>
497
498 #include "compatibility.h"
499 --- src/MainSDL_Event.cpp
500 +++ src/MainSDL_Event.cpp
501 @@ -9,9 +9,9 @@
502
503 #ifdef USE_SDL
504
505 -#include <stdlib.h>
506 -#include <stdio.h>
507 -#include <string.h>
508 +#include <cstdlib>
509 +#include <cstdio>
510 +#include <cstring>
511
512 #include "Config.h"
513
514 --- src/MenuGL.cpp
515 +++ src/MenuGL.cpp
516 @@ -7,9 +7,9 @@
517 */
518 #include "MenuGL.h"
519
520 -#include <stdlib.h>
521 -#include <string.h>
522 -#include <math.h>
523 +#include <cstdlib>
524 +#include <cstring>
525 +#include <cmath>
526
527 #include "compatibility.h"
528 #include <GL/gl.h>
529 --- src/NCString.cpp
530 +++ src/NCString.cpp
531 @@ -1,10 +1,11 @@
532 #include "NCString.h"
533
534 -#include <stdio.h>
535 -#include <ctype.h>
536 -#include <stdlib.h>
537 -#include <string.h>
538 -#include <limits.h>
539 +#include <cstdio>
540 +#include <cctype>
541 +#include <cstdlib>
542 +#include <cstring>
543 +#include <climits>
544 +#include <cstdarg>
545
546 /**
547 * ctor
548 @@ -1463,7 +1464,7 @@
549 NCString operator + (const char *s1, const NCString &s2) { NCString tmp(s1); tmp += s2; return tmp; }
550 NCString operator + (const NCString &s1, const char *s2) { NCString tmp(s1); tmp += s2; return tmp; }
551 //-----------------------------------------------------
552 -ostream& operator << (ostream &os, const NCString &s1)
553 +std::ostream& operator << (std::ostream &os, const NCString &s1)
554 {
555 return os << (const char*)s1;
556 }
557 --- src/NCString.h
558 +++ src/NCString.h
559 @@ -1,7 +1,7 @@
560 #ifndef NCString_h
561 #define NCString_h
562
563 -#include <stream.h>
564 +#include <iostream>
565
566 typedef unsigned int uint;
567 typedef unsigned short ushort;
568 @@ -123,7 +123,7 @@
569 /** add @relates NCString */ NCString operator + (const NCString &s1, const NCString &s2);
570 /** add @relates NCString */ NCString operator + (const char *s1, const NCString &s2);
571 /** add @relates NCString */ NCString operator + (const NCString &s1, const char *s2);
572 -/** stream @relates NCString */ ostream& operator << (ostream &os, const NCString &s1);
573 +/** stream @relates NCString */ std::ostream& operator << (std::ostream &os, const NCString &s1);
574
575 #endif // NCString_h
576
577 --- src/PowerUps.cpp
578 +++ src/PowerUps.cpp
579 @@ -7,9 +7,9 @@
580 */
581 #include "PowerUps.h"
582
583 -#include <stdio.h>
584 -#include <stdlib.h>
585 -#include <math.h>
586 +#include <cstdio>
587 +#include <cstdlib>
588 +#include <cmath>
589
590 #include "compatibility.h"
591 #include <GL/gl.h>
592 --- src/ScreenItem.cpp
593 +++ src/ScreenItem.cpp
594 @@ -7,7 +7,7 @@
595 */
596 #include "ScreenItem.h"
597
598 -#include <stdio.h>
599 +#include <cstdio>
600
601
602 int ScreenItem::itemCount = 0;
603 --- src/ScreenItemAdd.cpp
604 +++ src/ScreenItemAdd.cpp
605 @@ -7,8 +7,8 @@
606 */
607 #include "ScreenItemAdd.h"
608
609 -#include <stdio.h>
610 -#include <stdlib.h>
611 +#include <cstdio>
612 +#include <cstdlib>
613
614 #include "define.h"
615 #include "Global.h"
616 --- src/StatusDisplay.cpp
617 +++ src/StatusDisplay.cpp
618 @@ -7,10 +7,10 @@
619 */
620 #include "StatusDisplay.h"
621
622 -#include <stdio.h>
623 -#include <stdlib.h>
624 -#include <string.h>
625 -#include <math.h>
626 +#include <cstdio>
627 +#include <cstdlib>
628 +#include <cstring>
629 +#include <cmath>
630
631 #include "compatibility.h"
632 #include <GL/gl.h>
633 --- src/TexFont.cpp
634 +++ src/TexFont.cpp
635 @@ -5,12 +5,12 @@
636 provided without guarantee or warrantee expressed or implied. This
637 program is -not- in the public domain. */
638 #include "compatibility.h"
639 -#include <assert.h>
640 -#include <ctype.h>
641 -#include <stdlib.h>
642 -#include <stdio.h>
643 -#include <string.h>
644 -#include <math.h>
645 +#include <cassert>
646 +#include <cctype>
647 +#include <cstdlib>
648 +#include <cstdio>
649 +#include <cstring>
650 +#include <cmath>
651 #include <GL/glu.h>
652 #include "TexFont.h"
653
654 --- src/extern.h
655 +++ src/extern.h
656 @@ -8,7 +8,7 @@
657 #ifndef extern_h
658 #define extern_h
659
660 -#include <stdio.h>
661 +#include <cstdio>
662
663 const char *dataLoc(const char *filename, bool doCheck = true);
664 const char *alterPathForPlatform(char *filename);
665 --- src/main.cpp
666 +++ src/main.cpp
667 @@ -8,15 +8,15 @@
668 #include "compatibility.h"
669 #include <GL/gl.h>
670
671 -#include <stdlib.h>
672 -#include <stdio.h>
673 -#include <string.h>
674 -#include <time.h>
675 +#include <cstdlib>
676 +#include <cstdio>
677 +#include <cstring>
678 +#include <ctime>
679
680 #ifndef _WIN32
681 #include <unistd.h>
682 #include <fcntl.h>
683 -#include <errno.h>
684 +#include <cerrno>
685 #include <sys/stat.h>
686 #endif // _WIN32
687
688 --- support/glpng/include/GL/glpng.h
689 +++ support/glpng/include/GL/glpng.h
690 @@ -23,7 +23,11 @@
691 #ifndef _GLPNG_H_
692 #define _GLPNG_H_
693
694 -#include <stdio.h>
695 +#ifdef __cplusplus
696 +# include <cstdio>
697 +#else
698 +# include <stdio.h>
699 +#endif
700
701 #ifdef __cplusplus
702 extern "C" {
703 --- support/glpng/src/glpng.c
704 +++ support/glpng/src/glpng.c
705 @@ -4,6 +4,8 @@
706 #endif
707
708 #include <GL/glpng.h>
709 +/* needed to get the glext prototypes */
710 +#define GL_GLEXT_PROTOTYPES
711 #include <GL/gl.h>
712 #include <stdlib.h>
713 #include <math.h>
714 @@ -47,7 +49,7 @@
715
716 static char gammaExplicit = 0; /*if */
717
718 -static void checkForGammaEnv()
719 +static void checkForGammaEnv(void)
720 {
721 double viewingGamma;
722 char *gammaEnv = getenv("VIEWING_GAMMA");
723 @@ -91,6 +93,7 @@
724 }
725 }
726
727 +#ifdef _WIN32
728 static int ExtSupported(const char *x) {
729 static const GLubyte *ext = NULL;
730 const char *c;
731 @@ -107,6 +110,7 @@
732
733 return 0;
734 }
735 +#endif
736
737 #define GET(o) ((int)*(data + (o)))
738
739
740
741
742 --
743 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups