| 1 |
vapier 08/05/10 10:59:11 |
| 2 |
|
| 3 |
Added: armagetronad-0.2.7.1-gcc43.patch |
| 4 |
Log: |
| 5 |
Add fix by Martin Väth for building with gcc-4.3 #218542. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/armagetronad/files/armagetronad-0.2.7.1-gcc43.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: armagetronad-0.2.7.1-gcc43.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/218542 |
| 17 |
|
| 18 |
--- src/engine/eAdvWall.h |
| 19 |
+++ src/engine/eAdvWall.h |
| 20 |
@@ -5,7 +5,7 @@ |
| 21 |
ArmageTron -- Just another Tron Lightcycle Game in 3D. |
| 22 |
Copyright (C) 2000 Manuel Moos (manuel@×××××××.de) |
| 23 |
#include <stdio> |
| 24 |
-#include <stdlib.h> |
| 25 |
+#include <cstdlib> |
| 26 |
************************************************************************** |
| 27 |
|
| 28 |
This program is free software; you can redistribute it and/or |
| 29 |
--- src/engine/eFloor.cpp |
| 30 |
+++ src/engine/eFloor.cpp |
| 31 |
@@ -28,7 +28,7 @@ |
| 32 |
#include "eFloor.h" |
| 33 |
#include "rScreen.h" |
| 34 |
#include "rTexture.h" |
| 35 |
-#include <stdlib.h> |
| 36 |
+#include <cstdlib> |
| 37 |
|
| 38 |
eFloor::eFloor(){Floor = this;} |
| 39 |
|
| 40 |
--- src/engine/eSound.cpp |
| 41 |
+++ src/engine/eSound.cpp |
| 42 |
@@ -36,7 +36,7 @@ |
| 43 |
#include "eCamera.h" |
| 44 |
//#include "tList.h" |
| 45 |
#include <iostream> |
| 46 |
-#include <stdlib.h> |
| 47 |
+#include <cstdlib> |
| 48 |
#include "eGrid.h" |
| 49 |
|
| 50 |
//eGrid* eSoundPlayer::S_Grid = NULL; |
| 51 |
--- src/network/md5.cpp |
| 52 |
+++ src/network/md5.cpp |
| 53 |
@@ -77,6 +77,7 @@ |
| 54 |
#include "md5.h" |
| 55 |
|
| 56 |
#include <string> |
| 57 |
+#include <cstring> |
| 58 |
#include <memory> |
| 59 |
|
| 60 |
#ifdef TEST |
| 61 |
--- src/network/nAuthentification.cpp |
| 62 |
+++ src/network/nAuthentification.cpp |
| 63 |
@@ -35,6 +35,7 @@ |
| 64 |
|
| 65 |
#include <memory> |
| 66 |
#include <string> |
| 67 |
+#include <cstring> |
| 68 |
|
| 69 |
static nAuthentification::UserPasswordCallback* S_UserPasswordCallback = NULL; |
| 70 |
static nAuthentification::LoginResultCallback* S_LoginResultCallback = NULL; |
| 71 |
--- src/network/nConfig.cpp |
| 72 |
+++ src/network/nConfig.cpp |
| 73 |
@@ -27,6 +27,7 @@ |
| 74 |
|
| 75 |
#include "nConfig.h" |
| 76 |
#include "tConsole.h" |
| 77 |
+#include <cstring> |
| 78 |
|
| 79 |
nConfItemBase::nConfItemBase() |
| 80 |
:tConfItemBase(""){}; |
| 81 |
--- src/network/nKrawall.cpp |
| 82 |
+++ src/network/nKrawall.cpp |
| 83 |
@@ -41,7 +41,8 @@ |
| 84 |
#include "tSysTime.h" |
| 85 |
#include "tMemManager.h" |
| 86 |
|
| 87 |
-#include <stdlib.h> |
| 88 |
+#include <cstdlib> |
| 89 |
+#include <cstring> |
| 90 |
#include <string> |
| 91 |
|
| 92 |
bool nKrawall::MayRequirePassword(tString& adress, unsigned int port) |
| 93 |
--- src/network/nNet.h |
| 94 |
+++ src/network/nNet.h |
| 95 |
@@ -25,7 +25,7 @@ |
| 96 |
#ifndef NET_ANET_H |
| 97 |
#define NET_ANET_H |
| 98 |
|
| 99 |
-#include <stdlib.h> |
| 100 |
+#include <cstdlib> |
| 101 |
#include <sys/types.h> |
| 102 |
|
| 103 |
#ifndef WIN32 |
| 104 |
--- src/network/nNetwork.cpp |
| 105 |
+++ src/network/nNetwork.cpp |
| 106 |
@@ -34,7 +34,7 @@ |
| 107 |
#include "tDirectories.h" |
| 108 |
#include "nNet.h" |
| 109 |
#include "tSysTime.h" |
| 110 |
-#include <stdlib.h> |
| 111 |
+#include <cstdlib> |
| 112 |
#include <fstream> |
| 113 |
#include <tMath.h> |
| 114 |
|
| 115 |
--- src/network/nServerInfo.cpp |
| 116 |
+++ src/network/nServerInfo.cpp |
| 117 |
@@ -42,6 +42,7 @@ |
| 118 |
#include "nNet.h" |
| 119 |
|
| 120 |
#include <fstream> |
| 121 |
+#include <cstring> |
| 122 |
|
| 123 |
static nServerInfo* sn_FirstServer = NULL; |
| 124 |
static sn_ServerInfoCreator* sn_Creator = NULL; |
| 125 |
--- src/network/net_udp.cpp |
| 126 |
+++ src/network/net_udp.cpp |
| 127 |
@@ -24,7 +24,8 @@ |
| 128 |
#include "nNet.h" |
| 129 |
|
| 130 |
#include <string> |
| 131 |
-#include <stdio.h> |
| 132 |
+#include <cstring> |
| 133 |
+#include <cstdio> |
| 134 |
|
| 135 |
#include <sys/types.h> |
| 136 |
|
| 137 |
@@ -60,7 +61,7 @@ |
| 138 |
|
| 139 |
|
| 140 |
#include <errno.h> |
| 141 |
-#include <stdlib.h> |
| 142 |
+#include <cstdlib> |
| 143 |
|
| 144 |
|
| 145 |
#ifdef __sun__ |
| 146 |
--- src/network/net_wins.cpp |
| 147 |
+++ src/network/net_wins.cpp |
| 148 |
@@ -30,8 +30,8 @@ |
| 149 |
#include <winsock.h> |
| 150 |
#include <sys/timeb.h> |
| 151 |
#endif |
| 152 |
-#include <stdlib.h> |
| 153 |
-#include <stdio.h> |
| 154 |
+#include <cstdlib> |
| 155 |
+#include <cstdio> |
| 156 |
|
| 157 |
#include "tString.h" |
| 158 |
#include "nNet.h" |
| 159 |
--- src/render/rConsoleCout.cpp |
| 160 |
+++ src/render/rConsoleCout.cpp |
| 161 |
@@ -29,7 +29,7 @@ |
| 162 |
#include "rFont.h" |
| 163 |
#include "tConfiguration.h" |
| 164 |
|
| 165 |
-#include <stdio.h> |
| 166 |
+#include <cstdio> |
| 167 |
#include <fcntl.h> |
| 168 |
#include <sstream> |
| 169 |
|
| 170 |
--- src/render/rFont.cpp |
| 171 |
+++ src/render/rFont.cpp |
| 172 |
@@ -28,7 +28,8 @@ |
| 173 |
#include "rFont.h" |
| 174 |
#include "rScreen.h" |
| 175 |
#include "tConfiguration.h" |
| 176 |
-#include <ctype.h> |
| 177 |
+#include <cctype> |
| 178 |
+#include <cstring> |
| 179 |
|
| 180 |
#ifndef DEDICATED |
| 181 |
#include "rRender.h" |
| 182 |
--- src/render/rModel.cpp |
| 183 |
+++ src/render/rModel.cpp |
| 184 |
@@ -26,8 +26,9 @@ |
| 185 |
*/ |
| 186 |
|
| 187 |
#include <string> |
| 188 |
+#include <cstring> |
| 189 |
#include <fstream> |
| 190 |
-#include <stdlib.h> |
| 191 |
+#include <cstdlib> |
| 192 |
#include "rScreen.h" |
| 193 |
#include "rModel.h" |
| 194 |
#include "tString.h" |
| 195 |
--- src/render/testgl.cpp |
| 196 |
+++ src/render/testgl.cpp |
| 197 |
@@ -1,5 +1,5 @@ |
| 198 |
-#include <stdlib.h> |
| 199 |
-#include <stdio.h> |
| 200 |
+#include <cstdlib> |
| 201 |
+#include <cstdio> |
| 202 |
#include <string> |
| 203 |
|
| 204 |
#include "rSDL.h" |
| 205 |
--- src/tools/tArray.cpp |
| 206 |
+++ src/tools/tArray.cpp |
| 207 |
@@ -29,8 +29,9 @@ |
| 208 |
|
| 209 |
#include "tMemManager.h" |
| 210 |
#include <iostream> |
| 211 |
-#include <stdlib.h> |
| 212 |
+#include <cstdlib> |
| 213 |
#include <string> |
| 214 |
+#include <cstring> |
| 215 |
#include "tArray.h" |
| 216 |
|
| 217 |
void GrowingArrayBase::ComplainIfFull(){ |
| 218 |
--- src/tools/tConfiguration.cpp |
| 219 |
+++ src/tools/tConfiguration.cpp |
| 220 |
@@ -29,8 +29,9 @@ |
| 221 |
#include <iomanip> |
| 222 |
#include <iostream> |
| 223 |
#include "tConfiguration.h" |
| 224 |
-#include <stdlib.h> |
| 225 |
-#include <ctype.h> |
| 226 |
+#include <cstdlib> |
| 227 |
+#include <cctype> |
| 228 |
+#include <cstring> |
| 229 |
#include <string> |
| 230 |
#include "tString.h" |
| 231 |
#include "tToDo.h" |
| 232 |
--- src/tools/tConfiguration.h |
| 233 |
+++ src/tools/tConfiguration.h |
| 234 |
@@ -35,7 +35,7 @@ |
| 235 |
#include "tConsole.h" |
| 236 |
#include "tLocale.h" |
| 237 |
#include <iostream> |
| 238 |
-#include <ctype.h> |
| 239 |
+#include <cctype> |
| 240 |
|
| 241 |
|
| 242 |
class tConfItemBase:public tListItem<tConfItemBase>{ |
| 243 |
--- src/tools/tCrypt.cpp |
| 244 |
+++ src/tools/tCrypt.cpp |
| 245 |
@@ -29,6 +29,7 @@ |
| 246 |
#include "tMemManager.h" |
| 247 |
|
| 248 |
#include <string> |
| 249 |
+#include <cstring> |
| 250 |
|
| 251 |
class tCryptDummy: public tCrypt |
| 252 |
{ |
| 253 |
--- src/tools/tDirectories.cpp |
| 254 |
+++ src/tools/tDirectories.cpp |
| 255 |
@@ -36,6 +36,7 @@ |
| 256 |
#include <windows.h> |
| 257 |
#endif |
| 258 |
|
| 259 |
+#include <cstring> |
| 260 |
#include <dirent.h> |
| 261 |
#include <sys/types.h> |
| 262 |
#include <sys/stat.h> |
| 263 |
--- src/tools/tError.cpp |
| 264 |
+++ src/tools/tError.cpp |
| 265 |
@@ -25,6 +25,7 @@ |
| 266 |
|
| 267 |
*/ |
| 268 |
|
| 269 |
+#include <cstdlib> |
| 270 |
#include <iostream> |
| 271 |
#ifndef WIN32 |
| 272 |
#include <unistd.h> |
| 273 |
--- src/tools/tLinkedList.h |
| 274 |
+++ src/tools/tLinkedList.h |
| 275 |
@@ -28,7 +28,7 @@ |
| 276 |
#ifndef ArmageTron_tLinkedList_H |
| 277 |
#define ArmageTron_tLinkedList_H |
| 278 |
|
| 279 |
-#include <stdlib.h> |
| 280 |
+#include <cstdlib> |
| 281 |
|
| 282 |
class tListItemBase{ |
| 283 |
protected: |
| 284 |
--- src/tools/tList.h |
| 285 |
+++ src/tools/tList.h |
| 286 |
@@ -31,7 +31,7 @@ |
| 287 |
#include "tArray.h" |
| 288 |
#include "tSafePTR.h" |
| 289 |
#include <new> |
| 290 |
-#include <stdlib.h> |
| 291 |
+#include <cstdlib> |
| 292 |
|
| 293 |
namespace referencing |
| 294 |
{ |
| 295 |
--- src/tools/tLocale.cpp |
| 296 |
+++ src/tools/tLocale.cpp |
| 297 |
@@ -32,6 +32,7 @@ |
| 298 |
|
| 299 |
#include <fstream> |
| 300 |
#include <string> |
| 301 |
+#include <cstring> |
| 302 |
|
| 303 |
class tLocaleSubItem; // identifies a single string in a single language |
| 304 |
|
| 305 |
--- src/tools/tMemManager.cpp |
| 306 |
+++ src/tools/tMemManager.cpp |
| 307 |
@@ -29,7 +29,7 @@ |
| 308 |
|
| 309 |
#include <iostream> |
| 310 |
#include <sstream> |
| 311 |
-#include <stdio.h> // need basic C IO since STL IO does memory management |
| 312 |
+#include <cstdio> // need basic C IO since STL IO does memory management |
| 313 |
#include "tMemManager.h" |
| 314 |
#include "tError.h" |
| 315 |
|
| 316 |
--- src/tools/tMemManager.h |
| 317 |
+++ src/tools/tMemManager.h |
| 318 |
@@ -37,7 +37,7 @@ |
| 319 |
//#endif |
| 320 |
#endif |
| 321 |
|
| 322 |
-#include <stdlib.h> |
| 323 |
+#include <cstdlib> |
| 324 |
|
| 325 |
class tMemMan{ |
| 326 |
public: |
| 327 |
--- src/tools/tMemStack.cpp |
| 328 |
+++ src/tools/tMemStack.cpp |
| 329 |
@@ -27,7 +27,7 @@ |
| 330 |
|
| 331 |
#include "tMemStack.h" |
| 332 |
#include "tArray.h" |
| 333 |
-#include <stdlib.h> |
| 334 |
+#include <cstdlib> |
| 335 |
|
| 336 |
static int& ST_Size() |
| 337 |
|
| 338 |
--- src/tools/tString.cpp |
| 339 |
+++ src/tools/tString.cpp |
| 340 |
@@ -28,7 +28,8 @@ |
| 341 |
#include "tMemManager.h" |
| 342 |
#include "tString.h" |
| 343 |
#include "tLocale.h" |
| 344 |
-#include <ctype.h> |
| 345 |
+#include <cctype> |
| 346 |
+#include <cstring> |
| 347 |
#include <string> |
| 348 |
#include <iostream> |
| 349 |
|
| 350 |
--- src/tools/transfab.cpp |
| 351 |
+++ src/tools/transfab.cpp |
| 352 |
@@ -26,7 +26,7 @@ |
| 353 |
*/ |
| 354 |
|
| 355 |
#include <iostream> |
| 356 |
-#include <ctype.h> |
| 357 |
+#include <cctype> |
| 358 |
#include <string> |
| 359 |
|
| 360 |
int main(){ |
| 361 |
--- src/tron/gAIBase.cpp |
| 362 |
+++ src/tron/gAIBase.cpp |
| 363 |
@@ -40,7 +40,7 @@ |
| 364 |
#include "eDebugLine.h" |
| 365 |
#include "gAICharacter.h" |
| 366 |
#include "tReferenceHolder.h" |
| 367 |
-#include <stdlib.h> |
| 368 |
+#include <cstdlib> |
| 369 |
|
| 370 |
#define AI_REACTION 0 |
| 371 |
#define AI_EMERGENCY 1 |
| 372 |
--- src/tron/gArmagetron.cpp |
| 373 |
+++ src/tron/gArmagetron.cpp |
| 374 |
@@ -48,8 +48,8 @@ |
| 375 |
#include "gAICharacter.h" |
| 376 |
#include "gCycle.h" |
| 377 |
//#include <unistd> |
| 378 |
-#include <stdio.h> |
| 379 |
-#include <stdlib.h> |
| 380 |
+#include <cstdio> |
| 381 |
+#include <cstdlib> |
| 382 |
#include <fstream> |
| 383 |
|
| 384 |
#include "nServerInfo.h" |
| 385 |
--- src/tron/gCycle.cpp |
| 386 |
+++ src/tron/gCycle.cpp |
| 387 |
@@ -46,7 +46,7 @@ |
| 388 |
#include "gAIBase.h" |
| 389 |
|
| 390 |
#include "tMath.h" |
| 391 |
-#include <stdlib.h> |
| 392 |
+#include <cstdlib> |
| 393 |
|
| 394 |
#ifndef DEDICATED |
| 395 |
#include "rRender.h" |
| 396 |
--- src/tron/gGame.cpp |
| 397 |
+++ src/tron/gGame.cpp |
| 398 |
@@ -66,10 +66,10 @@ |
| 399 |
#include "eVoter.h" |
| 400 |
|
| 401 |
#include <math.h> |
| 402 |
-#include <stdlib.h> |
| 403 |
+#include <cstdlib> |
| 404 |
#include <string> |
| 405 |
#include <fstream> |
| 406 |
-#include <ctype.h> |
| 407 |
+#include <cctype> |
| 408 |
#include <time.h> |
| 409 |
|
| 410 |
#ifdef DEDICATED |
| 411 |
@@ -3586,7 +3586,7 @@ |
| 412 |
} |
| 413 |
|
| 414 |
#include <fcntl.h> |
| 415 |
-#include <stdio.h> |
| 416 |
+#include <cstdio> |
| 417 |
#include <errno.h> |
| 418 |
|
| 419 |
bool GameLoop(bool input=true){ |
| 420 |
--- src/tron/gWall.h |
| 421 |
+++ src/tron/gWall.h |
| 422 |
@@ -5,7 +5,7 @@ |
| 423 |
ArmageTron -- Just another Tron Lightcycle Game in 3D. |
| 424 |
Copyright (C) 2000 Manuel Moos (manuel@×××××××.de) |
| 425 |
#include <stdio> |
| 426 |
-#include <stdlib.h> |
| 427 |
+#include <cstdlib> |
| 428 |
************************************************************************** |
| 429 |
|
| 430 |
This program is free software; you can redistribute it and/or |
| 431 |
|
| 432 |
|
| 433 |
|
| 434 |
-- |
| 435 |
gentoo-commits@l.g.o mailing list |
Archives