diff options
| author | marino <marino@pkgsrc.org> | 2012-10-11 11:36:20 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-10-11 11:36:20 +0000 |
| commit | a469e857a87aaea7ca052cb8c3b38d1df15fc166 (patch) | |
| tree | d1ee2df0ac249bbdd6ddf26bff9156bd59b8b111 /games | |
| parent | 2e258e1a4153db355a0308fd77754af09ee5893c (diff) | |
| download | pkgsrc-a469e857a87aaea7ca052cb8c3b38d1df15fc166.tar.gz | |
games/ivan: Fix redeclared variable error
gcc 4.7.2 stops build when "int c" is declared twice.
Diffstat (limited to 'games')
| -rw-r--r-- | games/ivan/distinfo | 3 | ||||
| -rw-r--r-- | games/ivan/patches/patch-FeLib_Source_bitmap.cc | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/games/ivan/distinfo b/games/ivan/distinfo index 07305bfaef0..820f7ced7fe 100644 --- a/games/ivan/distinfo +++ b/games/ivan/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.7 2011/11/25 21:54:14 joerg Exp $ +$NetBSD: distinfo,v 1.8 2012/10/11 11:36:20 marino Exp $ SHA1 (ivan-0.50.tar.gz) = e4c5ae2b9bdfd59a0ed3c87a504043df12b0f1a4 RMD160 (ivan-0.50.tar.gz) = 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91 Size (ivan-0.50.tar.gz) = 803651 bytes +SHA1 (patch-FeLib_Source_bitmap.cc) = 88a4c73046069aed5e3a3c67ed22a1f22230254a SHA1 (patch-FeLib_Source_festring.cpp) = f45e5a3228f168888ecb5f645f463a2b8a3d903a SHA1 (patch-FeLib_Source_fetime.cpp) = f941686fedd9603f1d89c0edb205caceef4b27ba SHA1 (patch-aa) = a52f3945a79e12cc72d30d9609c4bf390809a5bd diff --git a/games/ivan/patches/patch-FeLib_Source_bitmap.cc b/games/ivan/patches/patch-FeLib_Source_bitmap.cc new file mode 100644 index 00000000000..cc7b3707132 --- /dev/null +++ b/games/ivan/patches/patch-FeLib_Source_bitmap.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-FeLib_Source_bitmap.cc,v 1.1 2012/10/11 11:36:20 marino Exp $ + +Fix "error: reclaration of `int c`" on gcc 4.7. + +--- FeLib/Source/bitmap.cpp.orig 2004-10-26 19:35:47.000000000 +0000 ++++ FeLib/Source/bitmap.cpp +@@ -881,7 +881,7 @@ void bitmap::DrawLine(int OrigFromX, int + const int Y2 = OrigToY + PointY[c]; + const int DeltaX = abs(X2 - X1); + const int DeltaY = abs(Y2 - Y1); +- int x, c; ++ int x; + int XChange, PtrXChange, PtrYChange; + int DoubleDeltaX, DoubleDeltaY, End; + |