1 |
nyhm 08/04/30 23:36:38 |
2 |
|
3 |
Added: ri-li-2.0.1-gcc43.patch |
4 |
Log: |
5 |
Fix building with gcc-4.3 |
6 |
(Portage version: 2.1.5_rc6) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: ri-li-2.0.1-gcc43.patch |
15 |
=================================================================== |
16 |
--- src/audio.cc |
17 |
+++ src/audio.cc |
18 |
@@ -22,7 +22,7 @@ |
19 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
20 |
|
21 |
#include <stdlib.h> |
22 |
-#include <iostream.h> |
23 |
+#include <iostream> |
24 |
#include <string.h> |
25 |
|
26 |
#include "audio.h" |
27 |
@@ -57,7 +57,7 @@ |
28 |
char PathFile[512]; |
29 |
|
30 |
if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) { |
31 |
- cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<endl; |
32 |
+ std::cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<std::endl; |
33 |
return false; |
34 |
} |
35 |
|
36 |
--- src/ecran.cc |
37 |
+++ src/ecran.cc |
38 |
@@ -21,7 +21,7 @@ |
39 |
// with this program; if not, write to the Free Software Foundation, Inc., |
40 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
41 |
|
42 |
-#include <iostream.h> |
43 |
+#include <iostream> |
44 |
#include <stdio.h> |
45 |
#include <stdlib.h> |
46 |
#include <math.h> |
47 |
--- src/editeur.cc |
48 |
+++ src/editeur.cc |
49 |
@@ -25,7 +25,7 @@ |
50 |
#include <windows.h> |
51 |
#endif |
52 |
|
53 |
-#include <iostream.h> |
54 |
+#include <iostream> |
55 |
#include <stdio.h> |
56 |
#include <stdlib.h> |
57 |
#include <string.h> |
58 |
@@ -374,7 +374,7 @@ |
59 |
|
60 |
// Sauve le niveau |
61 |
if(Niveau.Save()==false) { |
62 |
- cerr <<"ERREUR Saving levels!"<<endl; |
63 |
+ std::cerr <<"ERREUR Saving levels!"<<std::endl; |
64 |
exit(-1); |
65 |
} |
66 |
|
67 |
--- src/jeux.cc |
68 |
+++ src/jeux.cc |
69 |
@@ -25,7 +25,7 @@ |
70 |
#include <windows.h> |
71 |
#endif |
72 |
|
73 |
-#include <iostream.h> |
74 |
+#include <iostream> |
75 |
#include <stdio.h> |
76 |
#include <stdlib.h> |
77 |
#include <string.h> |
78 |
--- src/loco.cc |
79 |
+++ src/loco.cc |
80 |
@@ -21,7 +21,7 @@ |
81 |
// with this program; if not, write to the Free Software Foundation, Inc., |
82 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
83 |
|
84 |
-#include <iostream.h> |
85 |
+#include <iostream> |
86 |
#include <stdio.h> |
87 |
#include <stdlib.h> |
88 |
#include <string.h> |
89 |
--- src/main.cc |
90 |
+++ src/main.cc |
91 |
@@ -23,7 +23,7 @@ |
92 |
|
93 |
#include <stdio.h> |
94 |
#include <stdlib.h> |
95 |
-#include <iostream.h> |
96 |
+#include <iostream> |
97 |
#include <string.h> |
98 |
#include <SDL/SDL.h> |
99 |
#include <SDL/SDL_mixer.h> |
100 |
@@ -115,7 +115,7 @@ |
101 |
|
102 |
// Initilise SDL |
103 |
if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) { |
104 |
- cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl; |
105 |
+ std::cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<std::endl; |
106 |
exit(-1); |
107 |
} |
108 |
// Ferme le programme correctement quant quit |
109 |
@@ -125,7 +125,7 @@ |
110 |
sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo(); |
111 |
|
112 |
if(sdlVideoInfo->vfmt->BitsPerPixel==8) { |
113 |
- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<endl; |
114 |
+ std::cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<std::endl; |
115 |
exit(-1); |
116 |
} |
117 |
|
118 |
@@ -145,7 +145,7 @@ |
119 |
sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption); |
120 |
|
121 |
if(sdlVideo==NULL) { |
122 |
- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<endl; |
123 |
+ std::cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<std::endl; |
124 |
exit(-1); |
125 |
} |
126 |
// Change le nom de la fenetre |
127 |
--- src/menu.cc |
128 |
+++ src/menu.cc |
129 |
@@ -21,7 +21,7 @@ |
130 |
// with this program; if not, write to the Free Software Foundation, Inc., |
131 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
132 |
|
133 |
-#include <iostream.h> |
134 |
+#include <iostream> |
135 |
#include <stdio.h> |
136 |
#include <stdlib.h> |
137 |
#include <string.h> |
138 |
@@ -92,7 +92,7 @@ |
139 |
// Teste la resolution video |
140 |
sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo(); |
141 |
if(sdlVideoInfo->vfmt->BitsPerPixel==8) { |
142 |
- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<endl; |
143 |
+ std::cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<<std::endl; |
144 |
exit(-1); |
145 |
} |
146 |
|
147 |
@@ -112,7 +112,7 @@ |
148 |
if(Pref.FullScreen) vOption|=SDL_FULLSCREEN; |
149 |
sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption); |
150 |
if(sdlVideo==NULL) { |
151 |
- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<endl; |
152 |
+ std::cerr <<"Impossible de passer dans le mode vidéo 800x600 !"<<std::endl; |
153 |
exit(-1); |
154 |
} |
155 |
|
156 |
--- src/mouse.cc |
157 |
+++ src/mouse.cc |
158 |
@@ -21,7 +21,7 @@ |
159 |
// with this program; if not, write to the Free Software Foundation, Inc., |
160 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
161 |
|
162 |
-#include <iostream.h> |
163 |
+#include <iostream> |
164 |
#include <stdio.h> |
165 |
#include "mouse.h" |
166 |
#include "preference.h" |
167 |
--- src/sprite.cc |
168 |
+++ src/sprite.cc |
169 |
@@ -21,7 +21,7 @@ |
170 |
// with this program; if not, write to the Free Software Foundation, Inc., |
171 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
172 |
|
173 |
-#include <iostream.h> |
174 |
+#include <iostream> |
175 |
#include <stdio.h> |
176 |
#include <stdlib.h> |
177 |
#include <string.h> |
178 |
@@ -84,7 +84,7 @@ |
179 |
strcpy(PathFile,Langue[Pref.Langue]); |
180 |
GetPath(PathFile); |
181 |
if(FileExiste(PathFile)==false) { |
182 |
- cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<endl; |
183 |
+ std::cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<std::endl; |
184 |
return false; |
185 |
} |
186 |
L=ChargeFichier(PathFile,Buf); |
187 |
@@ -128,7 +128,7 @@ |
188 |
// *** Charge le fichier des langues *** |
189 |
// ************************************* |
190 |
if(FileExiste(PathFile)==false) { |
191 |
- cerr <<"Impossible de trouver 'language.dat'"<<endl; |
192 |
+ std::cerr <<"Impossible de trouver 'language.dat'"<<std::endl; |
193 |
return false; |
194 |
} |
195 |
L=ChargeFichier(PathFile,Buf); |
196 |
@@ -163,7 +163,7 @@ |
197 |
strcpy(PathFile,"sprites.dat"); |
198 |
GetPath(PathFile); |
199 |
if(FileExiste(PathFile)==false) { |
200 |
- cerr <<"Impossible de trouver 'sprites.dat'"<<endl; |
201 |
+ std::cerr <<"Impossible de trouver 'sprites.dat'"<<std::endl; |
202 |
return false; |
203 |
} |
204 |
L=ChargeFichier(PathFile,Buf); |
205 |
@@ -352,7 +352,7 @@ |
206 |
Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8, |
207 |
0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3)); |
208 |
if(Image[i]<=NULL) { |
209 |
- cerr <<"Impossible de créer une Surface SDL!"<<endl; |
210 |
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl; |
211 |
return false; |
212 |
} |
213 |
|
214 |
@@ -486,7 +486,7 @@ |
215 |
Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8, |
216 |
0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3)); |
217 |
if(Image[0]<=NULL) { |
218 |
- cerr <<"Impossible de créer une Surface SDL!"<<endl; |
219 |
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl; |
220 |
return false; |
221 |
} |
222 |
return true; |
223 |
--- src/tableau.cc |
224 |
+++ src/tableau.cc |
225 |
@@ -21,7 +21,7 @@ |
226 |
// with this program; if not, write to the Free Software Foundation, Inc., |
227 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
228 |
|
229 |
-#include <iostream.h> |
230 |
+#include <iostream> |
231 |
#include <stdio.h> |
232 |
#include <stdlib.h> |
233 |
#include "preference.h" |
234 |
--- src/utils.cc |
235 |
+++ src/utils.cc |
236 |
@@ -21,7 +21,7 @@ |
237 |
// with this program; if not, write to the Free Software Foundation, Inc., |
238 |
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
239 |
|
240 |
-#include <iostream.h> |
241 |
+#include <iostream> |
242 |
#include <stdio.h> |
243 |
#include <stdlib.h> |
244 |
#include <string.h> |
245 |
@@ -77,7 +77,7 @@ |
246 |
|
247 |
file=fopen(Path,"r"); |
248 |
if(!file) { |
249 |
- cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl; |
250 |
+ std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl; |
251 |
perror("fopen"); |
252 |
return -1; |
253 |
} |
254 |
@@ -93,7 +93,7 @@ |
255 |
|
256 |
Buf=new unsigned char [L+1]; |
257 |
if(Buf==NULL) { |
258 |
- cerr <<"ERREUR: Memoire insuffisante!"<<endl; |
259 |
+ std::cerr <<"ERREUR: Memoire insuffisante!"<<std::endl; |
260 |
fclose(file); |
261 |
return -1; |
262 |
} |
263 |
@@ -104,7 +104,7 @@ |
264 |
while(Compt>1024) { |
265 |
AfficheChargeur(); |
266 |
if( fread(Po,1,1024,file) != 1024 ) { |
267 |
- cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<endl; |
268 |
+ std::cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<std::endl; |
269 |
perror("fread"); |
270 |
fclose(file); |
271 |
delete [] Buf; |
272 |
@@ -169,14 +169,14 @@ |
273 |
|
274 |
file=fopen(Path,"w"); |
275 |
if(!file) { |
276 |
- cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl; |
277 |
+ std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl; |
278 |
perror("fopen"); |
279 |
return false; |
280 |
} |
281 |
|
282 |
while(L>512) { |
283 |
if( fwrite(Buf,1,512,file) != 512 ) { |
284 |
- cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl; |
285 |
+ std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl; |
286 |
perror("fwrite"); |
287 |
fclose(file); |
288 |
return false; |
289 |
@@ -187,7 +187,7 @@ |
290 |
|
291 |
if(L>0) { |
292 |
if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) { |
293 |
- cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl; |
294 |
+ std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl; |
295 |
perror("fwrite"); |
296 |
fclose(file); |
297 |
return false; |
298 |
@@ -250,7 +250,7 @@ |
299 |
sprintf(Path,"/usr/share/games/Ri-li/%s",Provi); |
300 |
if(FileExiste(Path)) return; |
301 |
|
302 |
- cerr <<"Impossible de trouver le fichier '"<<Provi<<endl; |
303 |
+ std::cerr <<"Impossible de trouver le fichier '"<<Provi<<std::endl; |
304 |
exit(-1); |
305 |
} |
306 |
#endif |
307 |
|
308 |
|
309 |
|
310 |
-- |
311 |
gentoo-commits@l.g.o mailing list |